tom-select-rails 0.1.0 → 2.2.0

data/vendor/assets/javascripts/tom-select-rails/cjs/tom-select.js

@@ -1,5 +1,5 @@
 /**
-* Tom Select v2.0.3
+* Tom Select v2.2.0
 * Licensed under the Apache License, Version 2.0 (the "License");
 */
 
@@ -33,9 +33,9 @@ class MicroEvent {
 
   on(events, fct) {
     forEvents(events, event => {
-      this._events[event] = this._events[event] || [];
-
-      this._events[event].push(fct);
+      const event_array = this._events[event] || [];
+      event_array.push(fct);
+      this._events[event] = event_array;
     });
   }
 
@@ -48,21 +48,26 @@ class MicroEvent {
     }
 
     forEvents(events, event => {
-      if (n === 1) return delete this._events[event];
-      if (event in this._events === false) return;
+      if (n === 1) {
+        delete this._events[event];
+        return;
+      }
 
-      this._events[event].splice(this._events[event].indexOf(fct), 1);
+      const event_array = this._events[event];
+      if (event_array === undefined) return;
+      event_array.splice(event_array.indexOf(fct), 1);
+      this._events[event] = event_array;
     });
   }
 
   trigger(events, ...args) {
     var self = this;
     forEvents(events, event => {
-      if (event in self._events === false) return;
-
-      for (let fct of self._events[event]) {
+      const event_array = self._events[event];
+      if (event_array === undefined) return;
+      event_array.forEach(fct => {
         fct.apply(self, args);
-      }
+      });
     });
   }
 
@@ -189,70 +194,124 @@ function MicroPlugin(Interface) {
   };
 }
 
-// https://github.com/andrewrk/node-diacritics/blob/master/index.js
-var latin_pat;
-const accent_pat = '[\u0300-\u036F\u{b7}\u{2be}]'; // \u{2bc}
-
-const accent_reg = new RegExp(accent_pat, 'g');
-var diacritic_patterns;
-const latin_convert = {
-  'æ': 'ae',
-  'ⱥ': 'a',
-  'ø': 'o'
-};
-const convert_pat = new RegExp(Object.keys(latin_convert).join('|'), 'g');
+/*! @orchidjs/unicode-variants | https://github.com/orchidjs/unicode-variants | Apache License (v2) */
 /**
- * code points generated from toCodePoints();
- * removed 65339 to 65345
+ * Convert array of strings to a regular expression
+ *	ex ['ab','a'] => (?:ab|a)
+ * 	ex ['a','b'] => [ab]
+ * @param {string[]} chars
+ * @return {string}
  */
+const arrayToPattern = chars => {
+  chars = chars.filter(Boolean);
 
-const code_points = [[67, 67], [160, 160], [192, 438], [452, 652], [961, 961], [1019, 1019], [1083, 1083], [1281, 1289], [1984, 1984], [5095, 5095], [7429, 7441], [7545, 7549], [7680, 7935], [8580, 8580], [9398, 9449], [11360, 11391], [42792, 42793], [42802, 42851], [42873, 42897], [42912, 42922], [64256, 64260], [65313, 65338], [65345, 65370]];
+  if (chars.length < 2) {
+    return chars[0] || '';
+  }
+
+  return maxValueLength(chars) == 1 ? '[' + chars.join('') + ']' : '(?:' + chars.join('|') + ')';
+};
 /**
- * Remove accents
- * via https://github.com/krisk/Fuse/issues/133#issuecomment-318692703
- *
+ * @param {string[]} array
+ * @return {string}
  */
 
-const asciifold = str => {
-  return str.normalize('NFKD').replace(accent_reg, '').toLowerCase().replace(convert_pat, function (foreignletter) {
-    return latin_convert[foreignletter];
+const sequencePattern = array => {
+  if (!hasDuplicates(array)) {
+    return array.join('');
+  }
+
+  let pattern = '';
+  let prev_char_count = 0;
+
+  const prev_pattern = () => {
+    if (prev_char_count > 1) {
+      pattern += '{' + prev_char_count + '}';
+    }
+  };
+
+  array.forEach((char, i) => {
+    if (char === array[i - 1]) {
+      prev_char_count++;
+      return;
+    }
+
+    prev_pattern();
+    pattern += char;
+    prev_char_count = 1;
   });
+  prev_pattern();
+  return pattern;
 };
 /**
  * Convert array of strings to a regular expression
  *	ex ['ab','a'] => (?:ab|a)
  * 	ex ['a','b'] => [ab]
- *
+ * @param {Set<string>} chars
+ * @return {string}
  */
 
+const setToPattern = chars => {
+  let array = toArray(chars);
+  return arrayToPattern(array);
+};
+/**
+ *
+ * https://stackoverflow.com/questions/7376598/in-javascript-how-do-i-check-if-an-array-has-duplicate-values
+ * @param {any[]} array
+ */
 
-const arrayToPattern = (chars, glue = '|') => {
-  if (chars.length == 1) {
-    return chars[0];
-  }
+const hasDuplicates = array => {
+  return new Set(array).size !== array.length;
+};
+/**
+ * https://stackoverflow.com/questions/63006601/why-does-u-throw-an-invalid-escape-error
+ * @param {string} str
+ * @return {string}
+ */
 
-  var longest = 1;
-  chars.forEach(a => {
-    longest = Math.max(longest, a.length);
-  });
+const escape_regex = str => {
+  return (str + '').replace(/([\$\(\)\*\+\.\?\[\]\^\{\|\}\\])/gu, '\\$1');
+};
+/**
+ * Return the max length of array values
+ * @param {string[]} array
+ *
+ */
 
-  if (longest == 1) {
-    return '[' + chars.join('') + ']';
-  }
+const maxValueLength = array => {
+  return array.reduce((longest, value) => Math.max(longest, unicodeLength(value)), 0);
+};
+/**
+ * @param {string} str
+ */
 
-  return '(?:' + chars.join(glue) + ')';
+const unicodeLength = str => {
+  return toArray(str).length;
 };
+/**
+ * @param {any} p
+ * @return {any[]}
+ */
+
+const toArray = p => Array.from(p);
+
+/*! @orchidjs/unicode-variants | https://github.com/orchidjs/unicode-variants | Apache License (v2) */
 /**
  * Get all possible combinations of substrings that add up to the given string
  * https://stackoverflow.com/questions/30169587/find-all-the-combination-of-substrings-that-add-up-to-the-given-string
- *
+ * @param {string} input
+ * @return {string[][]}
  */
-
 const allSubstrings = input => {
   if (input.length === 1) return [[input]];
-  var result = [];
-  allSubstrings(input.substring(1)).forEach(function (subresult) {
-    var tmp = subresult.slice(0);
+  /** @type {string[][]} */
+
+  let result = [];
+  const start = input.substring(1);
+  const suba = allSubstrings(start);
+  suba.forEach(function (subresult) {
+    let tmp = subresult.slice(0);
     tmp[0] = input.charAt(0) + tmp[0];
     result.push(tmp);
     tmp = subresult.slice(0);
@@ -261,96 +320,500 @@ const allSubstrings = input => {
   });
   return result;
 };
+
+/*! @orchidjs/unicode-variants | https://github.com/orchidjs/unicode-variants | Apache License (v2) */
+
 /**
- * Generate a list of diacritics from the list of code points
+ * @typedef {{[key:string]:string}} TUnicodeMap
+ * @typedef {{[key:string]:Set<string>}} TUnicodeSets
+ * @typedef {[[number,number]]} TCodePoints
+ * @typedef {{folded:string,composed:string,code_point:number}} TCodePointObj
+ * @typedef {{start:number,end:number,length:number,substr:string}} TSequencePart
+ */
+/** @type {TCodePoints} */
+
+const code_points = [[0, 65535]];
+const accent_pat = '[\u0300-\u036F\u{b7}\u{2be}]'; // \u{2bc}
+
+/** @type {TUnicodeMap} */
+
+let unicode_map;
+/** @type {RegExp} */
+
+let multi_char_reg;
+const max_char_length = 3;
+/** @type {TUnicodeMap} */
+
+const latin_convert = {
+  'æ': 'ae',
+  'ⱥ': 'a',
+  'ø': 'o',
+  '⁄': '/',
+  '∕': '/'
+};
+const convert_pat = new RegExp(Object.keys(latin_convert).join('|') + '|' + accent_pat, 'gu');
+/**
+ * Initialize the unicode_map from the give code point ranges
  *
+ * @param {TCodePoints=} _code_points
+ */
+
+const initialize = _code_points => {
+  if (unicode_map !== undefined) return;
+  unicode_map = generateMap(_code_points || code_points);
+};
+/**
+ * Helper method for normalize a string
+ * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize
+ * @param {string} str
+ * @param {string} form
+ */
+
+const normalize = (str, form = 'NFKD') => str.normalize(form);
+/**
+ * Compatibility Decomposition without reordering string
+ * calling str.normalize('NFKD') on \u{594}\u{595}\u{596} becomes \u{596}\u{594}\u{595}
+ * @param {string} str
+ */
+
+const decompose = str => {
+  if (str.match(/[\u0f71-\u0f81]/)) {
+    return toArray(str).reduce(
+    /**
+     * @param {string} result
+     * @param {string} char
+     */
+    (result, char) => {
+      return result + normalize(char);
+    }, '');
+  }
+
+  return normalize(str);
+};
+/**
+ * Remove accents
+ * via https://github.com/krisk/Fuse/issues/133#issuecomment-318692703
+ * @param {string} str
+ * @return {string}
+ */
+
+const asciifold = str => {
+  return decompose(str).toLowerCase().replace(convert_pat, (
+  /** @type {string} */
+  char) => {
+    return latin_convert[char] || '';
+  });
+};
+/**
+ * Generate a list of unicode variants from the list of code points
+ * @param {TCodePoints} code_points
+ * @yield {TCodePointObj}
  */
 
-const generateDiacritics = () => {
-  var diacritics = {};
-  code_points.forEach(code_range => {
-    for (let i = code_range[0]; i <= code_range[1]; i++) {
-      let diacritic = String.fromCharCode(i);
-      let latin = asciifold(diacritic);
+function* generator(code_points) {
+  for (const [code_point_min, code_point_max] of code_points) {
+    for (let i = code_point_min; i <= code_point_max; i++) {
+      let composed = String.fromCharCode(i);
+      let folded = asciifold(composed);
+
+      if (folded == composed.toLowerCase()) {
+        continue;
+      } // skip when folded is a string longer than 3 characters long
+      // bc the resulting regex patterns will be long
+      // eg:
+      // folded صلى الله عليه وسلم length 18 code point 65018
+      // folded جل جلاله length 8 code point 65019
+
 
-      if (latin == diacritic.toLowerCase()) {
+      if (folded.length > max_char_length) {
         continue;
       }
 
-      if (!(latin in diacritics)) {
-        diacritics[latin] = [latin];
+      if (folded.length == 0) {
+        continue;
       }
 
-      var patt = new RegExp(arrayToPattern(diacritics[latin]), 'iu');
+      let decomposed = normalize(composed);
+      let recomposed = normalize(decomposed, 'NFC');
 
-      if (diacritic.match(patt)) {
+      if (recomposed === composed && folded === decomposed) {
         continue;
       }
 
-      diacritics[latin].push(diacritic);
+      yield {
+        folded: folded,
+        composed: composed,
+        code_point: i
+      };
+    }
+  }
+}
+/**
+ * Generate a unicode map from the list of code points
+ * @param {TCodePoints} code_points
+ * @return {TUnicodeSets}
+ */
+
+const generateSets = code_points => {
+  /** @type {{[key:string]:Set<string>}} */
+  const unicode_sets = {};
+  /**
+   * @param {string} folded
+   * @param {string} to_add
+   */
+
+  const addMatching = (folded, to_add) => {
+    /** @type {Set<string>} */
+    const folded_set = unicode_sets[folded] || new Set();
+    const patt = new RegExp('^' + setToPattern(folded_set) + '$', 'iu');
+
+    if (to_add.match(patt)) {
+      return;
     }
+
+    folded_set.add(escape_regex(to_add));
+    unicode_sets[folded] = folded_set;
+  };
+
+  for (let value of generator(code_points)) {
+    addMatching(value.folded, value.folded);
+    addMatching(value.folded, value.composed);
+  }
+
+  return unicode_sets;
+};
+/**
+ * Generate a unicode map from the list of code points
+ * ae => (?:(?:ae|Æ|Ǽ|Ǣ)|(?:A|Ⓐ|Ａ...)(?:E|ɛ|Ⓔ...))
+ *
+ * @param {TCodePoints} code_points
+ * @return {TUnicodeMap}
+ */
+
+const generateMap = code_points => {
+  /** @type {TUnicodeSets} */
+  const unicode_sets = generateSets(code_points);
+  /** @type {TUnicodeMap} */
+
+  const unicode_map = {};
+  /** @type {string[]} */
+
+  let multi_char = [];
+
+  for (let folded in unicode_sets) {
+    let set = unicode_sets[folded];
+
+    if (set) {
+      unicode_map[folded] = setToPattern(set);
+    }
+
+    if (folded.length > 1) {
+      multi_char.push(escape_regex(folded));
+    }
+  }
+
+  multi_char.sort((a, b) => b.length - a.length);
+  const multi_char_patt = arrayToPattern(multi_char);
+  multi_char_reg = new RegExp('^' + multi_char_patt, 'u');
+  return unicode_map;
+};
+/**
+ * Map each element of an array from it's folded value to all possible unicode matches
+ * @param {string[]} strings
+ * @param {number} min_replacement
+ * @return {string}
+ */
+
+const mapSequence = (strings, min_replacement = 1) => {
+  let chars_replaced = 0;
+  strings = strings.map(str => {
+    if (unicode_map[str]) {
+      chars_replaced += str.length;
+    }
+
+    return unicode_map[str] || str;
   });
-  var latin_chars = Object.keys(diacritics); // latin character pattern
-  // match longer substrings first
-
-  latin_chars = latin_chars.sort((a, b) => b.length - a.length);
-  latin_pat = new RegExp('(' + arrayToPattern(latin_chars) + accent_pat + '*)', 'g'); // build diacritic patterns
-  // ae needs: 
-  //	(?:(?:ae|Æ|Ǽ|Ǣ)|(?:A|Ⓐ|Ａ...)(?:E|ɛ|Ⓔ...))
-
-  var diacritic_patterns = {};
-  latin_chars.sort((a, b) => a.length - b.length).forEach(latin => {
-    var substrings = allSubstrings(latin);
-    var pattern = substrings.map(sub_pat => {
-      sub_pat = sub_pat.map(l => {
-        if (diacritics.hasOwnProperty(l)) {
-          return arrayToPattern(diacritics[l]);
+
+  if (chars_replaced >= min_replacement) {
+    return sequencePattern(strings);
+  }
+
+  return '';
+};
+/**
+ * Convert a short string and split it into all possible patterns
+ * Keep a pattern only if min_replacement is met
+ *
+ * 'abc'
+ * 		=> [['abc'],['ab','c'],['a','bc'],['a','b','c']]
+ *		=> ['abc-pattern','ab-c-pattern'...]
+ *
+ *
+ * @param {string} str
+ * @param {number} min_replacement
+ * @return {string}
+ */
+
+const substringsToPattern = (str, min_replacement = 1) => {
+  min_replacement = Math.max(min_replacement, str.length - 1);
+  return arrayToPattern(allSubstrings(str).map(sub_pat => {
+    return mapSequence(sub_pat, min_replacement);
+  }));
+};
+/**
+ * Convert an array of sequences into a pattern
+ * [{start:0,end:3,length:3,substr:'iii'}...] => (?:iii...)
+ *
+ * @param {Sequence[]} sequences
+ * @param {boolean} all
+ */
+
+const sequencesToPattern = (sequences, all = true) => {
+  let min_replacement = sequences.length > 1 ? 1 : 0;
+  return arrayToPattern(sequences.map(sequence => {
+    let seq = [];
+    const len = all ? sequence.length() : sequence.length() - 1;
+
+    for (let j = 0; j < len; j++) {
+      seq.push(substringsToPattern(sequence.substrs[j] || '', min_replacement));
+    }
+
+    return sequencePattern(seq);
+  }));
+};
+/**
+ * Return true if the sequence is already in the sequences
+ * @param {Sequence} needle_seq
+ * @param {Sequence[]} sequences
+ */
+
+
+const inSequences = (needle_seq, sequences) => {
+  for (const seq of sequences) {
+    if (seq.start != needle_seq.start || seq.end != needle_seq.end) {
+      continue;
+    }
+
+    if (seq.substrs.join('') !== needle_seq.substrs.join('')) {
+      continue;
+    }
+
+    let needle_parts = needle_seq.parts;
+    /**
+     * @param {TSequencePart} part
+     */
+
+    const filter = part => {
+      for (const needle_part of needle_parts) {
+        if (needle_part.start === part.start && needle_part.substr === part.substr) {
+          return false;
         }
 
-        return l;
-      });
-      return arrayToPattern(sub_pat, '');
-    });
-    diacritic_patterns[latin] = arrayToPattern(pattern);
-  });
-  return diacritic_patterns;
+        if (part.length == 1 || needle_part.length == 1) {
+          continue;
+        } // check for overlapping parts
+        // a = ['::=','==']
+        // b = ['::','===']
+        // a = ['r','sm']
+        // b = ['rs','m']
+
+
+        if (part.start < needle_part.start && part.end > needle_part.start) {
+          return true;
+        }
+
+        if (needle_part.start < part.start && needle_part.end > part.start) {
+          return true;
+        }
+      }
+
+      return false;
+    };
+
+    let filtered = seq.parts.filter(filter);
+
+    if (filtered.length > 0) {
+      continue;
+    }
+
+    return true;
+  }
+
+  return false;
 };
+
+class Sequence {
+  constructor() {
+    /** @type {TSequencePart[]} */
+    this.parts = [];
+    /** @type {string[]} */
+
+    this.substrs = [];
+    this.start = 0;
+    this.end = 0;
+  }
+  /**
+   * @param {TSequencePart|undefined} part
+   */
+
+
+  add(part) {
+    if (part) {
+      this.parts.push(part);
+      this.substrs.push(part.substr);
+      this.start = Math.min(part.start, this.start);
+      this.end = Math.max(part.end, this.end);
+    }
+  }
+
+  last() {
+    return this.parts[this.parts.length - 1];
+  }
+
+  length() {
+    return this.parts.length;
+  }
+  /**
+   * @param {number} position
+   * @param {TSequencePart} last_piece
+   */
+
+
+  clone(position, last_piece) {
+    let clone = new Sequence();
+    let parts = JSON.parse(JSON.stringify(this.parts));
+    let last_part = parts.pop();
+
+    for (const part of parts) {
+      clone.add(part);
+    }
+
+    let last_substr = last_piece.substr.substring(0, position - last_part.start);
+    let clone_last_len = last_substr.length;
+    clone.add({
+      start: last_part.start,
+      end: last_part.start + clone_last_len,
+      length: clone_last_len,
+      substr: last_substr
+    });
+    return clone;
+  }
+
+}
 /**
- * Expand a regular expression pattern to include diacritics
+ * Expand a regular expression pattern to include unicode variants
  * 	eg /a/ becomes /aⓐａẚàáâầấẫẩãāăằắẵẳȧǡäǟảåǻǎȁȃạậặḁąⱥɐɑAⒶＡÀÁÂẦẤẪẨÃĀĂẰẮẴẲȦǠÄǞẢÅǺǍȀȂẠẬẶḀĄȺⱯ/
  *
+ * Issue:
+ *  ﺊﺋ [ 'ﺊ = \\u{fe8a}', 'ﺋ = \\u{fe8b}' ]
+ *	becomes:	ئئ [ 'ي = \\u{64a}', 'ٔ = \\u{654}', 'ي = \\u{64a}', 'ٔ = \\u{654}' ]
+ *
+ *	İIJ = IIJ = ⅡJ
+ *
+ * 	1/2/4
+ *
+ * @param {string} str
+ * @return {string|undefined}
  */
 
-const diacriticRegexPoints = regex => {
-  if (diacritic_patterns === undefined) {
-    diacritic_patterns = generateDiacritics();
-  }
 
-  const decomposed = regex.normalize('NFKD').toLowerCase();
-  return decomposed.split(latin_pat).map(part => {
-    if (part == '') {
-      return '';
-    } // "ffl" or "ffl"
+const getPattern = str => {
+  initialize();
+  str = asciifold(str);
+  let pattern = '';
+  let sequences = [new Sequence()];
+
+  for (let i = 0; i < str.length; i++) {
+    let substr = str.substring(i);
+    let match = substr.match(multi_char_reg);
+    const char = str.substring(i, i + 1);
+    const match_str = match ? match[0] : null; // loop through sequences
+    // add either the char or multi_match
+
+    let overlapping = [];
+    let added_types = new Set();
+
+    for (const sequence of sequences) {
+      const last_piece = sequence.last();
+
+      if (!last_piece || last_piece.length == 1 || last_piece.end <= i) {
+        // if we have a multi match
+        if (match_str) {
+          const len = match_str.length;
+          sequence.add({
+            start: i,
+            end: i + len,
+            length: len,
+            substr: match_str
+          });
+          added_types.add('1');
+        } else {
+          sequence.add({
+            start: i,
+            end: i + 1,
+            length: 1,
+            substr: char
+          });
+          added_types.add('2');
+        }
+      } else if (match_str) {
+        let clone = sequence.clone(i, last_piece);
+        const len = match_str.length;
+        clone.add({
+          start: i,
+          end: i + len,
+          length: len,
+          substr: match_str
+        });
+        overlapping.push(clone);
+      } else {
+        // don't add char
+        // adding would create invalid patterns: 234 => [2,34,4]
+        added_types.add('3');
+      }
+    } // if we have overlapping
 
 
-    const no_accent = asciifold(part);
+    if (overlapping.length > 0) {
+      // ['ii','iii'] before ['i','i','iii']
+      overlapping = overlapping.sort((a, b) => {
+        return a.length() - b.length();
+      });
 
-    if (diacritic_patterns.hasOwnProperty(no_accent)) {
-      return diacritic_patterns[no_accent];
-    } // 'أهلا' (\u{623}\u{647}\u{644}\u{627}) or 'أهلا' (\u{627}\u{654}\u{647}\u{644}\u{627})
+      for (let clone of overlapping) {
+        // don't add if we already have an equivalent sequence
+        if (inSequences(clone, sequences)) {
+          continue;
+        }
+
+        sequences.push(clone);
+      }
+
+      continue;
+    } // if we haven't done anything unique
+    // clean up the patterns
+    // helps keep patterns smaller
+    // if str = 'r₨㎧aarss', pattern will be 446 instead of 655
 
 
-    const composed_part = part.normalize('NFC');
+    if (i > 0 && added_types.size == 1 && !added_types.has('3')) {
+      pattern += sequencesToPattern(sequences, false);
+      let new_seq = new Sequence();
+      const old_seq = sequences[0];
 
-    if (composed_part != part) {
-      return arrayToPattern([part, composed_part]);
+      if (old_seq) {
+        new_seq.add(old_seq.last());
+      }
+
+      sequences = [new_seq];
     }
+  }
 
-    return part;
-  }).join('');
+  pattern += sequencesToPattern(sequences, true);
+  return pattern;
 };
 
-// @ts-ignore TS2691 "An import path cannot end with a '.ts' extension"
+/*! sifter.js | https://github.com/orchidjs/sifter.js | Apache License (v2) */
 
 /**
  * A property getter resolving dot-notation
@@ -388,20 +851,13 @@ const scoreValue = (value, token, weight) => {
   var score, pos;
   if (!value) return 0;
   value = value + '';
+  if (token.regex == null) return 0;
   pos = value.search(token.regex);
   if (pos === -1) return 0;
   score = token.string.length / value.length;
   if (pos === 0) score += 0.5;
   return score * weight;
 };
-/**
- *
- * https://stackoverflow.com/questions/63006601/why-does-u-throw-an-invalid-escape-error
- */
-
-const escape_regex = str => {
-  return (str + '').replace(/([\$\(-\+\.\?\[-\^\{-\}])/g, '\\$1');
-};
 /**
  * Cast object property to an array if it exists and has a value
  *
@@ -426,7 +882,7 @@ const propToArray = (obj, key) => {
  *
  */
 
-const iterate = (object, callback) => {
+const iterate$1 = (object, callback) => {
   if (Array.isArray(object)) {
     object.forEach(callback);
   } else {
@@ -449,6 +905,8 @@ const cmp = (a, b) => {
   return 0;
 };
 
+/*! sifter.js | https://github.com/orchidjs/sifter.js | Apache License (v2) */
+
 /**
  * sifter.js
  * Copyright (c) 2013–2020 Brian Reavis & contributors
@@ -509,13 +967,13 @@ class Sifter {
       }
 
       if (word.length > 0) {
-        regex = escape_regex(word);
-
         if (this.settings.diacritics) {
-          regex = diacriticRegexPoints(regex);
+          regex = getPattern(word) || null;
+        } else {
+          regex = escape_regex(word);
         }
 
-        if (respect_word_boundaries) regex = "\\b" + regex;
+        if (regex && respect_word_boundaries) regex = "\\b" + regex;
       }
 
       tokens.push({
@@ -533,12 +991,17 @@ class Sifter {
    * Good matches will have a higher score than poor matches.
    * If an item is not a match, 0 will be returned by the function.
    *
-   * @returns {function}
+   * @returns {T.ScoreFn}
    */
   getScoreFunction(query, options) {
     var search = this.prepareSearch(query, options);
     return this._getScoreFunction(search);
   }
+  /**
+   * @returns {T.ScoreFn}
+   *
+   */
+
 
   _getScoreFunction(search) {
     const tokens = search.tokens,
@@ -571,7 +1034,7 @@ class Sifter {
       if (field_count === 1) {
         return function (token, data) {
           const field = fields[0].field;
-          return scoreValue(getAttrFn(data, field), token, weights[field]);
+          return scoreValue(getAttrFn(data, field), token, weights[field] || 1);
         };
       }
 
@@ -587,7 +1050,7 @@ class Sifter {
             sum += scoreValue(value, token, 1);
           }
         } else {
-          iterate(weights, (weight, field) => {
+          iterate$1(weights, (weight, field) => {
             sum += scoreValue(getAttrFn(data, field), token, weight);
           });
         }
@@ -604,12 +1067,11 @@ class Sifter {
 
     if (search.options.conjunction === 'and') {
       return function (data) {
-        var i = 0,
-            score,
+        var score,
             sum = 0;
 
-        for (; i < token_count; i++) {
-          score = scoreObject(tokens[i], data);
+        for (let token of tokens) {
+          score = scoreObject(token, data);
           if (score <= 0) return 0;
           sum += score;
         }
@@ -619,7 +1081,7 @@ class Sifter {
     } else {
       return function (data) {
         var sum = 0;
-        iterate(tokens, token => {
+        iterate$1(tokens, token => {
           sum += scoreObject(token, data);
         });
         return sum / token_count;
@@ -640,12 +1102,11 @@ class Sifter {
   }
 
   _getSortFunction(search) {
-    var i, n, implicit_score;
+    var implicit_score,
+        sort_flds = [];
     const self = this,
           options = search.options,
-          sort = !search.query && options.sort_empty ? options.sort_empty : options.sort,
-          sort_flds = [],
-          multipliers = [];
+          sort = !search.query && options.sort_empty ? options.sort_empty : options.sort;
 
     if (typeof sort == 'function') {
       return sort.bind(this);
@@ -664,9 +1125,9 @@ class Sifter {
 
 
     if (sort) {
-      for (i = 0, n = sort.length; i < n; i++) {
-        if (search.query || sort[i].field !== '$score') {
-          sort_flds.push(sort[i]);
+      for (let s of sort) {
+        if (search.query || s.field !== '$score') {
+          sort_flds.push(s);
         }
       }
     } // the "$score" field is implied to be the primary
@@ -676,8 +1137,8 @@ class Sifter {
     if (search.query) {
       implicit_score = true;
 
-      for (i = 0, n = sort_flds.length; i < n; i++) {
-        if (sort_flds[i].field === '$score') {
+      for (let fld of sort_flds) {
+        if (fld.field === '$score') {
           implicit_score = false;
           break;
         }
@@ -688,18 +1149,10 @@ class Sifter {
           field: '$score',
           direction: 'desc'
         });
-      }
-    } else {
-      for (i = 0, n = sort_flds.length; i < n; i++) {
-        if (sort_flds[i].field === '$score') {
-          sort_flds.splice(i, 1);
-          break;
-        }
-      }
-    }
+      } // without a search.query, all items will have the same score
 
-    for (i = 0, n = sort_flds.length; i < n; i++) {
-      multipliers.push(sort_flds[i].direction === 'desc' ? -1 : 1);
+    } else {
+      sort_flds = sort_flds.filter(fld => fld.field !== '$score');
     } // build function
 
 
@@ -707,25 +1160,20 @@ class Sifter {
 
     if (!sort_flds_count) {
       return null;
-    } else if (sort_flds_count === 1) {
-      const sort_fld = sort_flds[0].field;
-      const multiplier = multipliers[0];
-      return function (a, b) {
-        return multiplier * cmp(get_field(sort_fld, a), get_field(sort_fld, b));
-      };
-    } else {
-      return function (a, b) {
-        var i, result, field;
+    }
 
-        for (i = 0; i < sort_flds_count; i++) {
-          field = sort_flds[i].field;
-          result = multipliers[i] * cmp(get_field(field, a), get_field(field, b));
-          if (result) return result;
-        }
+    return function (a, b) {
+      var result, field;
 
-        return 0;
-      };
-    }
+      for (let sort_fld of sort_flds) {
+        field = sort_fld.field;
+        let multiplier = sort_fld.direction === 'desc' ? -1 : 1;
+        result = multiplier * cmp(get_field(field, a), get_field(field, b));
+        if (result) return result;
+      }
+
+      return 0;
+    };
   }
 
   /**
@@ -784,7 +1232,7 @@ class Sifter {
 
 
     if (query.length) {
-      iterate(self.items, (item, id) => {
+      iterate$1(self.items, (item, id) => {
         score = fn_score(item);
 
         if (options.filter === false || score > 0) {
@@ -795,7 +1243,7 @@ class Sifter {
         }
       });
     } else {
-      iterate(self.items, (_, id) => {
+      iterate$1(self.items, (_, id) => {
         search.items.push({
           'score': 1,
           'id': id
@@ -818,6 +1266,29 @@ class Sifter {
 
 }
 
+/**
+ * Iterates over arrays and hashes.
+ *
+ * ```
+ * iterate(this.items, function(item, id) {
+ *    // invoked for each item
+ * });
+ * ```
+ *
+ */
+
+const iterate = (object, callback) => {
+  if (Array.isArray(object)) {
+    object.forEach(callback);
+  } else {
+    for (var key in object) {
+      if (object.hasOwnProperty(key)) {
+        callback(object[key], key);
+      }
+    }
+  }
+};
+
 /**
  * Return a dom element from either a dom query string, jQuery object, a dom element or html string
  * https://stackoverflow.com/questions/494143/creating-a-new-dom-element-from-an-html-string-using-built-in-dom-methods-or-pro/35385518#35385518
@@ -835,10 +1306,10 @@ const getDom = query => {
   }
 
   if (isHtmlString(query)) {
-    let div = document.createElement('div');
-    div.innerHTML = query.trim(); // Never return a text node of whitespace as the result
+    var tpl = document.createElement('template');
+    tpl.innerHTML = query.trim(); // Never return a text node of whitespace as the result
 
-    return div.firstChild;
+    return tpl.content.firstChild;
   }
 
   return document.querySelector(query);
@@ -1049,9 +1520,9 @@ const highlight = (element, regex) => {
 
   const highlightChildren = node => {
     if (node.nodeType === 1 && node.childNodes && !/(script|style)/i.test(node.tagName) && (node.className !== 'highlight' || node.tagName !== 'SPAN')) {
-      for (var i = 0; i < node.childNodes.length; ++i) {
-        i += highlightRecursive(node.childNodes[i]);
-      }
+      Array.from(node.childNodes).forEach(element => {
+        highlightRecursive(element);
+      });
     }
   };
 
@@ -1528,6 +1999,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
     this.isInputHidden = false;
     this.isSetup = false;
     this.ignoreFocus = false;
+    this.ignoreHover = false;
     this.hasOptions = false;
     this.currentResults = void 0;
     this.lastValue = '';
@@ -1623,7 +2095,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
       control_input = getDom(settings.controlInput); // set attributes
 
       var attrs = ['autocorrect', 'autocapitalize', 'autocomplete'];
-      iterate(attrs, attr => {
+      iterate$1(attrs, attr => {
         if (input.getAttribute(attr)) {
           setAttr(control_input, {
             [attr]: input.getAttribute(attr)
@@ -1726,7 +2198,16 @@ class TomSelect extends MicroPlugin(MicroEvent) {
       settings.load = loadDebounce(settings.load, settings.loadThrottle);
     }
 
-    self.control_input.type = input.type; // clicking on an option should select it
+    self.control_input.type = input.type;
+    addEvent(dropdown, 'mousemove', () => {
+      self.ignoreHover = false;
+    });
+    addEvent(dropdown, 'mouseenter', e => {
+      var target_match = parentMatch(e.target, '[data-selectable]', dropdown);
+      if (target_match) self.onOptionHover(e, target_match);
+    }, {
+      capture: true
+    }); // clicking on an option should select it
 
     addEvent(dropdown, 'click', evt => {
       const option = parentMatch(evt.target, '[data-selectable]');
@@ -1760,7 +2241,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
     addEvent(focus_node, 'resize', () => self.positionDropdown(), passive_event);
     addEvent(focus_node, 'blur', e => self.onBlur(e));
     addEvent(focus_node, 'focus', e => self.onFocus(e));
-    addEvent(focus_node, 'paste', e => self.onPaste(e));
+    addEvent(control_input, 'paste', e => self.onPaste(e));
 
     const doc_mousedown = evt => {
       // blur if target is outside of this instance
@@ -1787,7 +2268,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
       }
     };
 
-    var win_scroll = () => {
+    const win_scroll = () => {
       if (self.isOpen) {
         self.positionDropdown();
       }
@@ -1816,7 +2297,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
     settings.items = [];
     delete settings.optgroups;
     delete settings.options;
-    addEvent(input, 'invalid', e => {
+    addEvent(input, 'invalid', () => {
       if (self.isValid) {
         self.isValid = false;
         self.isInvalid = true;
@@ -1853,7 +2334,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
     // build options table
     this.addOptions(options); // build optgroup table
 
-    iterate(optgroups, optgroup => {
+    iterate$1(optgroups, optgroup => {
       this.registerOptionGroup(optgroup);
     });
   }
@@ -2004,21 +2485,31 @@ class TomSelect extends MicroPlugin(MicroEvent) {
     // input and create Items for each separate value
 
 
-    if (self.settings.splitOn) {
-      // Wait for pasted text to be recognized in value
-      setTimeout(() => {
-        var pastedText = self.inputValue();
+    if (!self.settings.splitOn) {
+      return;
+    } // Wait for pasted text to be recognized in value
 
-        if (!pastedText.match(self.settings.splitOn)) {
-          return;
-        }
 
-        var splitInput = pastedText.trim().split(self.settings.splitOn);
-        iterate(splitInput, piece => {
-          self.createItem(piece);
-        });
-      }, 0);
-    }
+    setTimeout(() => {
+      var pastedText = self.inputValue();
+
+      if (!pastedText.match(self.settings.splitOn)) {
+        return;
+      }
+
+      var splitInput = pastedText.trim().split(self.settings.splitOn);
+      iterate$1(splitInput, piece => {
+        const hash = hash_key(piece);
+
+        if (hash) {
+          if (this.options[piece]) {
+            self.addItem(piece);
+          } else {
+            self.createItem(piece);
+          }
+        }
+      });
+    }, 0);
   }
   /**
    * Triggered on <input> keypress.
@@ -2050,6 +2541,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
 
   onKeyDown(e) {
     var self = this;
+    self.ignoreHover = true;
 
     if (self.isLocked) {
       if (e.keyCode !== KEY_TAB) {
@@ -2110,6 +2602,8 @@ class TomSelect extends MicroPlugin(MicroEvent) {
           self.onOptionSelect(e, self.activeOption);
           preventDefault(e); // if the option_create=null, the dropdown might be closed
         } else if (self.settings.create && self.createItem()) {
+          preventDefault(e); // don't submit form when searching for a value
+        } else if (document.activeElement == self.control_input && self.isOpen) {
           preventDefault(e);
         }
 
@@ -2180,6 +2674,17 @@ class TomSelect extends MicroPlugin(MicroEvent) {
       self.trigger('type', value);
     }
   }
+  /**
+   * Triggered when the user rolls over
+   * an option in the autocomplete dropdown menu.
+   *
+   */
+
+
+  onOptionHover(evt, option) {
+    if (this.ignoreHover) return;
+    this.setActiveOption(option, false);
+  }
   /**
    * Triggered on <input> focus.
    *
@@ -2229,7 +2734,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
     };
 
     if (self.settings.create && self.settings.createOnBlur) {
-      self.createItem(null, false, deactivate);
+      self.createItem(null, deactivate);
     } else {
       deactivate();
     }
@@ -2250,7 +2755,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
     }
 
     if (option.classList.contains('create')) {
-      self.createItem(null, true, () => {
+      self.createItem(null, () => {
         if (self.settings.closeAfterSelect) {
           self.close();
         }
@@ -2534,7 +3039,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
    */
 
 
-  setActiveOption(option) {
+  setActiveOption(option, scroll = true) {
     if (option === this.activeOption) {
       return;
     }
@@ -2549,7 +3054,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
       'aria-selected': 'true'
     });
     addClasses(option, 'active');
-    this.scrollToOption(option);
+    if (scroll) this.scrollToOption(option);
   }
   /**
    * Sets the dropdown_content scrollTop to display the option
@@ -2619,7 +3124,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
     self.hideInput();
     self.close();
     self.activeItems = activeItems;
-    iterate(activeItems, item => {
+    iterate$1(activeItems, item => {
       self.setActiveItemClass(item);
     });
   }
@@ -2755,7 +3260,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
 
 
   search(query) {
-    var i, result, calculateScore;
+    var result, calculateScore;
     var self = this;
     var options = this.getSearchOptions(); // validate user-provided result scoring function
 
@@ -2780,13 +3285,10 @@ class TomSelect extends MicroPlugin(MicroEvent) {
 
 
     if (self.settings.hideSelected) {
-      for (i = result.items.length - 1; i >= 0; i--) {
-        let hashed = hash_key(result.items[i].id);
-
-        if (hashed && self.items.indexOf(hashed) !== -1) {
-          result.items.splice(i, 1);
-        }
-      }
+      result.items = result.items.filter(item => {
+        let hashed = hash_key(item.id);
+        return !(hashed && self.items.indexOf(hashed) !== -1);
+      });
     }
 
     return result;
@@ -2799,21 +3301,24 @@ class TomSelect extends MicroPlugin(MicroEvent) {
 
 
   refreshOptions(triggerDropdown = true) {
-    var i, j, k, n, optgroup, optgroups, html, has_create_option, active_value, active_group;
+    var i, j, k, n, optgroup, optgroups, html, has_create_option, active_group;
     var create;
     const groups = {};
     const groups_order = [];
     var self = this;
     var query = self.inputValue();
+    const same_query = query === self.lastQuery || query == '' && self.lastQuery == null;
     var results = self.search(query);
-    var active_option = null; //self.activeOption;
-
+    var active_option = null;
     var show_dropdown = self.settings.shouldOpen || false;
     var dropdown_content = self.dropdown_content;
 
-    if (self.activeOption) {
-      active_value = self.activeOption.dataset.value;
-      active_group = self.activeOption.closest('[data-group]');
+    if (same_query) {
+      active_option = self.activeOption;
+
+      if (active_option) {
+        active_group = active_option.closest('[data-group]');
+      }
     } // build markup
 
 
@@ -2830,12 +3335,16 @@ class TomSelect extends MicroPlugin(MicroEvent) {
 
     for (i = 0; i < n; i++) {
       // get option dom element
-      let opt_value = results.items[i].id;
+      let item = results.items[i];
+      if (!item) continue;
+      let opt_value = item.id;
       let option = self.options[opt_value];
-      let option_el = self.getOption(opt_value, true); // toggle 'selected' class
+      if (option === undefined) continue;
+      let opt_hash = get_hash(opt_value);
+      let option_el = self.getOption(opt_hash, true); // toggle 'selected' class
 
       if (!self.settings.hideSelected) {
-        option_el.classList.toggle('selected', self.items.includes(opt_value));
+        option_el.classList.toggle('selected', self.items.includes(opt_hash));
       }
 
       optgroup = option[self.settings.optgroupField] || '';
@@ -2848,8 +3357,10 @@ class TomSelect extends MicroPlugin(MicroEvent) {
           optgroup = '';
         }
 
-        if (!groups.hasOwnProperty(optgroup)) {
-          groups[optgroup] = document.createDocumentFragment();
+        let group_fragment = groups[optgroup];
+
+        if (group_fragment === undefined) {
+          group_fragment = document.createDocumentFragment();
           groups_order.push(optgroup);
         } // nodes can only have one parent, so if the option is in mutple groups, we need a clone
 
@@ -2861,48 +3372,50 @@ class TomSelect extends MicroPlugin(MicroEvent) {
             'aria-selected': null
           });
           option_el.classList.add('ts-cloned');
-          removeClasses(option_el, 'active');
-        } // make sure we keep the activeOption in the same group
+          removeClasses(option_el, 'active'); // make sure we keep the activeOption in the same group
 
-
-        if (!active_option && active_value == opt_value) {
-          if (active_group) {
-            if (active_group.dataset.group === optgroup) {
+          if (self.activeOption && self.activeOption.dataset.value == opt_value) {
+            if (active_group && active_group.dataset.group === optgroup.toString()) {
               active_option = option_el;
             }
-          } else {
-            active_option = option_el;
           }
         }
 
-        groups[optgroup].appendChild(option_el);
+        group_fragment.appendChild(option_el);
+        groups[optgroup] = group_fragment;
       }
     } // sort optgroups
 
 
-    if (this.settings.lockOptgroupOrder) {
+    if (self.settings.lockOptgroupOrder) {
       groups_order.sort((a, b) => {
-        var a_order = self.optgroups[a] && self.optgroups[a].$order || 0;
-        var b_order = self.optgroups[b] && self.optgroups[b].$order || 0;
+        const grp_a = self.optgroups[a];
+        const grp_b = self.optgroups[b];
+        const a_order = grp_a && grp_a.$order || 0;
+        const b_order = grp_b && grp_b.$order || 0;
         return a_order - b_order;
       });
     } // render optgroup headers & join groups
 
 
     html = document.createDocumentFragment();
-    iterate(groups_order, optgroup => {
-      if (self.optgroups.hasOwnProperty(optgroup) && groups[optgroup].children.length) {
+    iterate$1(groups_order, optgroup => {
+      let group_fragment = groups[optgroup];
+      if (!group_fragment || !group_fragment.children.length) return;
+      let group_heading = self.optgroups[optgroup];
+
+      if (group_heading !== undefined) {
         let group_options = document.createDocumentFragment();
-        let header = self.render('optgroup_header', self.optgroups[optgroup]);
+        let header = self.render('optgroup_header', group_heading);
         append(group_options, header);
-        append(group_options, groups[optgroup]);
+        append(group_options, group_fragment);
         let group_html = self.render('optgroup', {
-          group: self.optgroups[optgroup],
+          group: group_heading,
           options: group_options
         });
         append(html, group_html);
       } else {
-        append(html, groups[optgroup]);
+        append(html, group_fragment);
       }
     });
     dropdown_content.innerHTML = '';
@@ -2912,7 +3425,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
       removeHighlight(dropdown_content);
 
       if (results.query.length && results.tokens.length) {
-        iterate(results.tokens, tok => {
+        iterate$1(results.tokens, tok => {
           highlight(dropdown_content, tok.regex);
         });
       }
@@ -2953,7 +3466,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
 
     if (show_dropdown) {
       if (results.items.length > 0) {
-        if (!active_option && self.settings.mode === 'single' && self.items.length) {
+        if (!active_option && self.settings.mode === 'single' && self.items[0] != undefined) {
           active_option = self.getOption(self.items[0]);
         }
 
@@ -3040,7 +3553,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
 
 
   addOptions(data, user_created = false) {
-    iterate(data, dat => {
+    iterate$1(data, dat => {
       this.addOption(dat, user_created);
     });
   }
@@ -3120,11 +3633,12 @@ class TomSelect extends MicroPlugin(MicroEvent) {
     const value_new = hash_key(data[self.settings.valueField]); // sanity checks
 
     if (value_old === null) return;
-    if (!self.options.hasOwnProperty(value_old)) return;
+    const data_old = self.options[value_old];
+    if (data_old == undefined) return;
     if (typeof value_new !== 'string') throw new Error('Value must be set in option data');
     const option = self.getOption(value_old);
     const item = self.getItem(value_old);
-    data.$order = data.$order || self.options[value_old].$order;
+    data.$order = data.$order || data_old.$order;
     delete self.options[value_old]; // invalidate render cache
     // don't remove existing node yet, we'll remove it after replacing it
 
@@ -3182,20 +3696,35 @@ class TomSelect extends MicroPlugin(MicroEvent) {
    */
 
 
-  clearOptions() {
+  clearOptions(filter) {
+    const boundFilter = (filter || this.clearFilter).bind(this);
     this.loadedSearches = {};
     this.userOptions = {};
     this.clearCache();
-    var selected = {};
-    iterate(this.options, (option, key) => {
-      if (this.items.indexOf(key) >= 0) {
-        selected[key] = this.options[key];
+    const selected = {};
+    iterate$1(this.options, (option, key) => {
+      if (boundFilter(option, key)) {
+        selected[key] = option;
       }
     });
     this.options = this.sifter.items = selected;
     this.lastQuery = null;
     this.trigger('option_clear');
   }
+  /**
+   * Used by clearOptions() to decide whether or not an option should be removed
+   * Return true to keep an option, false to remove
+   *
+   */
+
+
+  clearFilter(option, value) {
+    if (this.items.indexOf(value) >= 0) {
+      return true;
+    }
+
+    return false;
+  }
   /**
    * Returns the dom element of the option
    * matching the given value.
@@ -3205,10 +3734,10 @@ class TomSelect extends MicroPlugin(MicroEvent) {
 
   getOption(value, create = false) {
     const hashed = hash_key(value);
+    if (hashed === null) return null;
+    const option = this.options[hashed];
 
-    if (hashed !== null && this.options.hasOwnProperty(hashed)) {
-      const option = this.options[hashed];
-
+    if (option != undefined) {
       if (option.$div) {
         return option.$div;
       }
@@ -3281,11 +3810,11 @@ class TomSelect extends MicroPlugin(MicroEvent) {
     var self = this;
     var items = Array.isArray(values) ? values : [values];
     items = items.filter(x => self.items.indexOf(x) === -1);
-
-    for (let i = 0, n = items.length; i < n; i++) {
-      self.isPending = i < n - 1;
-      self.addItem(items[i], silent);
-    }
+    const last_item = items[items.length - 1];
+    items.forEach(item => {
+      self.isPending = item !== last_item;
+      self.addItem(item, silent);
+    });
   }
   /**
    * "Selects" an item. Adds it to the list
@@ -3416,7 +3945,16 @@ class TomSelect extends MicroPlugin(MicroEvent) {
    */
 
 
-  createItem(input = null, triggerDropdown = true, callback = () => {}) {
+  createItem(input = null, callback = () => {}) {
+    // triggerDropdown parameter @deprecated 2.1.1
+    if (arguments.length === 3) {
+      callback = arguments[2];
+    }
+
+    if (typeof callback != 'function') {
+      callback = () => {};
+    }
+
     var self = this;
     var caret = self.caretPos;
     var output;
@@ -3515,11 +4053,11 @@ class TomSelect extends MicroPlugin(MicroEvent) {
   refreshValidityState() {
     var self = this;
 
-    if (!self.input.checkValidity) {
+    if (!self.input.validity) {
       return;
     }
 
-    self.isValid = self.input.checkValidity();
+    self.isValid = self.input.validity.valid;
     self.isInvalid = !self.isValid;
   }
   /**
@@ -3692,7 +4230,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
     var self = this;
     if (!self.items.length) return;
     var items = self.controlChildren();
-    iterate(items, item => {
+    iterate$1(items, item => {
       self.removeItem(item, true);
     });
     self.showInput();
@@ -3710,7 +4248,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
     const self = this;
     const caret = self.caretPos;
     const target = self.control;
-    target.insertBefore(el, target.children[caret]);
+    target.insertBefore(el, target.children[caret] || null);
     self.setCaret(caret + 1);
   }
   /**
@@ -3735,20 +4273,23 @@ class TomSelect extends MicroPlugin(MicroEvent) {
         caret++;
       }
 
-      iterate(self.activeItems, item => rm_items.push(item));
+      iterate$1(self.activeItems, item => rm_items.push(item));
     } else if ((self.isFocused || self.settings.mode === 'single') && self.items.length) {
       const items = self.controlChildren();
+      let rm_item;
 
       if (direction < 0 && selection.start === 0 && selection.length === 0) {
-        rm_items.push(items[self.caretPos - 1]);
+        rm_item = items[self.caretPos - 1];
       } else if (direction > 0 && selection.start === self.inputValue().length) {
-        rm_items.push(items[self.caretPos]);
+        rm_item = items[self.caretPos];
       }
-    }
 
-    const values = rm_items.map(item => item.dataset.value); // allow the callback to abort
+      if (rm_item !== undefined) {
+        rm_items.push(rm_item);
+      }
+    }
 
-    if (!values.length || typeof self.settings.onDelete === 'function' && self.settings.onDelete.call(self, values, e) === false) {
+    if (!self.shouldDelete(rm_items, e)) {
       return false;
     }
 
@@ -3767,6 +4308,20 @@ class TomSelect extends MicroPlugin(MicroEvent) {
     self.refreshOptions(false);
     return true;
   }
+  /**
+   * Return true if the items should be deleted
+   */
+
+
+  shouldDelete(items, evt) {
+    const values = items.map(item => item.dataset.value); // allow the callback to abort
+
+    if (!values.length || typeof this.settings.onDelete === 'function' && this.settings.onDelete(values, evt) === false) {
+      return false;
+    }
+
+    return true;
+  }
   /**
    * Selects the previous / next item (depending on the `direction` argument).
    *
@@ -3932,26 +4487,11 @@ class TomSelect extends MicroPlugin(MicroEvent) {
 
 
   render(templateName, data) {
-    if (typeof this.settings.render[templateName] !== 'function') {
-      return null;
-    }
-
-    return this._render(templateName, data);
-  }
-  /**
-   * _render() can be called directly when we know we don't want to hit the cache
-   * return type could be null for some templates, we need https://github.com/microsoft/TypeScript/issues/33014
-   */
-
-
-  _render(templateName, data) {
-    var value = '',
-        id,
-        html;
+    var id, html;
     const self = this;
 
-    if (templateName === 'option' || templateName == 'item') {
-      value = get_hash(data[self.settings.valueField]);
+    if (typeof this.settings.render[templateName] !== 'function') {
+      return null;
     } // render markup
 
 
@@ -3987,6 +4527,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
     }
 
     if (templateName === 'option' || templateName === 'item') {
+      const value = get_hash(data[self.settings.valueField]);
       setAttr(html, {
         'data-value': value
       }); // make sure we have some classes if a template is overwritten
@@ -4003,12 +4544,28 @@ class TomSelect extends MicroPlugin(MicroEvent) {
           id: data.$id
         }); // update cache
 
-        self.options[value].$div = html;
+        data.$div = html;
+        self.options[value] = data;
       }
     }
 
     return html;
   }
+  /**
+   * Type guarded rendering
+   *
+   */
+
+
+  _render(templateName, data) {
+    const html = this.render(templateName, data);
+
+    if (html == null) {
+      throw 'HTMLElement expected';
+    }
+
+    return html;
+  }
   /**
    * Clears the render cache for a template. If
    * no template is given, clears all render
@@ -4018,7 +4575,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
 
 
   clearCache() {
-    iterate(this.options, (option, value) => {
+    iterate$1(this.options, option => {
       if (option.$div) {
         option.$div.remove();
         delete option.$div;