tom-select-rails 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 231e3258e61b1031bb0bdc51591296466f00d73c50045af6797026dfc083b41c
-  data.tar.gz: 81d4cd624faab6229846e51fef1438729a1c9fad6e344f7cabbac7219177c7e4
+  metadata.gz: 1b3cc20dc49ea2de80dfdfe939c1b4b32aabf86d74fbd188907b0de731129a87
+  data.tar.gz: 7c7e09dfa447bec81857c137f3ba82084a94fc20c44e62bdae1cc5ad8ac44068
 SHA512:
-  metadata.gz: 07016fd5c972592fe25603b904e139daa660def15f3ce15599edc39f48dd63570b611f8a15e6862531850169420792b5fcca9fa2b119e5428c9f47d9552e3d99
-  data.tar.gz: eb42bd93be577d053bbfb018af2ed5d8eb7a09af39cc90ca03fbc8a3dc606fee251aa6ba14df0efa59a064764ec954924682da8984ac59eae0039e8a2efc467f
+  metadata.gz: c62aeb791ae593fa5428acd0a0b76587abd77c505b2c34110acbb3be9228b15ce61395e2e214e5da5a136f6d0d401a74c1b479787fc1c91a5b347ff30cc20741
+  data.tar.gz: 789659f7b13407003b2b99bf993b37017030278c87da2389455547d14d56c55b126a27f2ecc1177980e7d3a6f12ba77da2f9044ad0d9f707121edfa97fcf9f29

data/lib/tom-select-rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TomSelect
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

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

@@ -1,5 +1,5 @@
 /**
-* Tom Select v2.0.3
+* Tom Select v2.1.0
 * Licensed under the Apache License, Version 2.0 (the "License");
 */
 
@@ -189,24 +189,20 @@ function MicroPlugin(Interface) {
   };
 }
 
+// @ts-ignore TS2691 "An import path cannot end with a '.ts' extension"
 // 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');
+const accent_reg = new RegExp(accent_pat, 'gu');
 var diacritic_patterns;
 const latin_convert = {
   'æ': 'ae',
   'ⱥ': 'a',
   'ø': 'o'
 };
-const convert_pat = new RegExp(Object.keys(latin_convert).join('|'), 'g');
-/**
- * code points generated from toCodePoints();
- * removed 65339 to 65345
- */
-
-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]];
+const convert_pat = new RegExp(Object.keys(latin_convert).join('|'), 'gu');
+const code_points = [[0, 65535]];
 /**
  * Remove accents
  * via https://github.com/krisk/Fuse/issues/133#issuecomment-318692703
@@ -225,7 +221,6 @@ const asciifold = str => {
  *
  */
 
-
 const arrayToPattern = (chars, glue = '|') => {
   if (chars.length == 1) {
     return chars[0];
@@ -242,6 +237,10 @@ const arrayToPattern = (chars, glue = '|') => {
 
   return '(?:' + chars.join(glue) + ')';
 };
+const escapeToPattern = chars => {
+  const escaped = chars.map(diacritic => escape_regex(diacritic));
+  return arrayToPattern(escaped);
+};
 /**
  * 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
@@ -266,7 +265,7 @@ const allSubstrings = input => {
  *
  */
 
-const generateDiacritics = () => {
+const generateDiacritics = code_points => {
   var diacritics = {};
   code_points.forEach(code_range => {
     for (let i = code_range[0]; i <= code_range[1]; i++) {
@@ -275,13 +274,22 @@ const generateDiacritics = () => {
 
       if (latin == diacritic.toLowerCase()) {
         continue;
+      } // skip when latin is a string longer than 3 characters long
+      // bc the resulting regex patterns will be long
+      // eg:
+      // latin صلى الله عليه وسلم length 18 code point 65018
+      // latin جل جلاله length 8 code point 65019
+
+
+      if (latin.length > 3) {
+        continue;
       }
 
       if (!(latin in diacritics)) {
         diacritics[latin] = [latin];
       }
 
-      var patt = new RegExp(arrayToPattern(diacritics[latin]), 'iu');
+      var patt = new RegExp(escapeToPattern(diacritics[latin]), 'iu');
 
       if (diacritic.match(patt)) {
         continue;
@@ -289,13 +297,23 @@ const generateDiacritics = () => {
 
       diacritics[latin].push(diacritic);
     }
-  });
-  var latin_chars = Object.keys(diacritics); // latin character pattern
+  }); // filter out if there's only one character in the list
+
+  let latin_chars = Object.keys(diacritics);
+
+  for (let i = 0; i < latin_chars.length; i++) {
+    const latin = latin_chars[i];
+
+    if (diacritics[latin].length < 2) {
+      delete diacritics[latin];
+    }
+  } // 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: 
+
+  latin_chars = Object.keys(diacritics).sort((a, b) => b.length - a.length);
+  latin_pat = new RegExp('(' + escapeToPattern(latin_chars) + accent_pat + '*)', 'gu'); // build diacritic patterns
+  // ae needs:
   //	(?:(?:ae|Æ|Ǽ|Ǣ)|(?:A|Ⓐ|Ａ...)(?:E|ɛ|Ⓔ...))
 
   var diacritic_patterns = {};
@@ -304,7 +322,7 @@ const generateDiacritics = () => {
     var pattern = substrings.map(sub_pat => {
       sub_pat = sub_pat.map(l => {
         if (diacritics.hasOwnProperty(l)) {
-          return arrayToPattern(diacritics[l]);
+          return escapeToPattern(diacritics[l]);
         }
 
         return l;
@@ -323,27 +341,20 @@ const generateDiacritics = () => {
 
 const diacriticRegexPoints = regex => {
   if (diacritic_patterns === undefined) {
-    diacritic_patterns = generateDiacritics();
+    diacritic_patterns = generateDiacritics(code_points);
   }
 
   const decomposed = regex.normalize('NFKD').toLowerCase();
   return decomposed.split(latin_pat).map(part => {
-    if (part == '') {
-      return '';
-    } // "ffl" or "ffl"
-
-
+    // "ffl" or "ffl"
     const no_accent = asciifold(part);
 
+    if (no_accent == '') {
+      return '';
+    }
+
     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})
-
-
-    const composed_part = part.normalize('NFC');
-
-    if (composed_part != part) {
-      return arrayToPattern([part, composed_part]);
     }
 
     return part;
@@ -509,10 +520,10 @@ class Sifter {
       }
 
       if (word.length > 0) {
-        regex = escape_regex(word);
-
         if (this.settings.diacritics) {
-          regex = diacriticRegexPoints(regex);
+          regex = diacriticRegexPoints(word);
+        } else {
+          regex = escape_regex(word);
         }
 
         if (respect_word_boundaries) regex = "\\b" + regex;
@@ -1528,6 +1539,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 = '';
@@ -1726,7 +1738,13 @@ 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, '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 +1778,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,18 +1805,24 @@ class TomSelect extends MicroPlugin(MicroEvent) {
       }
     };
 
-    var win_scroll = () => {
+    const win_scroll = () => {
       if (self.isOpen) {
         self.positionDropdown();
       }
     };
 
+    const win_hover = () => {
+      self.ignoreHover = false;
+    };
+
     addEvent(document, 'mousedown', doc_mousedown);
     addEvent(window, 'scroll', win_scroll, passive_event);
     addEvent(window, 'resize', win_scroll, passive_event);
+    addEvent(window, 'mousemove', win_hover, passive_event);
 
     this._destroy = () => {
       document.removeEventListener('mousedown', doc_mousedown);
+      window.removeEventListener('mousemove', win_hover);
       window.removeEventListener('scroll', win_scroll);
       window.removeEventListener('resize', win_scroll);
       if (label) label.removeEventListener('click', label_click);
@@ -2004,21 +2028,29 @@ 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 => {
+    setTimeout(() => {
+      var pastedText = self.inputValue();
+
+      if (!pastedText.match(self.settings.splitOn)) {
+        return;
+      }
+
+      var splitInput = pastedText.trim().split(self.settings.splitOn);
+      iterate(splitInput, piece => {
+        piece = hash_key(piece);
+
+        if (this.options[piece]) {
+          self.addItem(piece);
+        } else {
           self.createItem(piece);
-        });
-      }, 0);
-    }
+        }
+      });
+    }, 0);
   }
   /**
    * Triggered on <input> keypress.
@@ -2050,6 +2082,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
 
   onKeyDown(e) {
     var self = this;
+    self.ignoreHover = true;
 
     if (self.isLocked) {
       if (e.keyCode !== KEY_TAB) {
@@ -2110,6 +2143,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 +2215,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.
    *
@@ -2534,7 +2580,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
    */
 
 
-  setActiveOption(option) {
+  setActiveOption(option, scroll = true) {
     if (option === this.activeOption) {
       return;
     }
@@ -2549,7 +2595,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
@@ -3182,13 +3228,14 @@ class TomSelect extends MicroPlugin(MicroEvent) {
    */
 
 
-  clearOptions() {
+  clearOptions(filter) {
+    const boundFilter = (filter || this.clearFilter).bind(this);
     this.loadedSearches = {};
     this.userOptions = {};
     this.clearCache();
-    var selected = {};
+    const selected = {};
     iterate(this.options, (option, key) => {
-      if (this.items.indexOf(key) >= 0) {
+      if (boundFilter(option, key)) {
         selected[key] = this.options[key];
       }
     });
@@ -3196,6 +3243,20 @@ class TomSelect extends MicroPlugin(MicroEvent) {
     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.
@@ -3515,11 +3576,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;
   }
   /**
@@ -3746,9 +3807,7 @@ class TomSelect extends MicroPlugin(MicroEvent) {
       }
     }
 
-    const values = rm_items.map(item => item.dataset.value); // allow the callback to abort
-
-    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 +3826,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).
    *
@@ -4124,10 +4197,12 @@ function checkbox_options () {
     setTimeout(() => {
       var checkbox = option.querySelector('input');
 
-      if (option.classList.contains('selected')) {
-        checkbox.checked = true;
-      } else {
-        checkbox.checked = false;
+      if (checkbox instanceof HTMLInputElement) {
+        if (option.classList.contains('selected')) {
+          checkbox.checked = true;
+        } else {
+          checkbox.checked = false;
+        }
       }
     }, 1);
   }; // add checkbox to option template
@@ -4454,7 +4529,9 @@ function dropdown_input () {
 
     self.hook('before', 'close', () => {
       if (!self.isOpen) return;
-      self.focus_node.focus();
+      self.focus_node.focus({
+        preventScroll: true
+      });
     });
   });
 }
@@ -4492,12 +4569,8 @@ function input_autogrow () {
 
 
     var resize = () => {
-      if (self.items.length > 0) {
-        test_input.textContent = control.value;
-        control.style.width = test_input.clientWidth + 'px';
-      } else {
-        control.style.width = '';
-      }
+      test_input.textContent = control.value;
+      control.style.width = test_input.clientWidth + 'px';
     };
 
     resize();
@@ -4576,6 +4649,7 @@ function optgroup_columns () {
       return orig_keydown.call(self, evt);
     }
 
+    self.ignoreHover = true;
     optgroup = parentMatch(self.activeOption, '[data-group]');
     index = nodeIndex(self.activeOption, '[data-selectable]');
 
@@ -4635,9 +4709,9 @@ function remove_button (userOptions) {
     var orig_render_item = self.settings.render.item;
 
     self.settings.render.item = (data, escape) => {
-      var rendered = getDom(orig_render_item.call(self, data, escape));
+      var item = getDom(orig_render_item.call(self, data, escape));
       var close_button = getDom(html);
-      rendered.appendChild(close_button);
+      item.appendChild(close_button);
       addEvent(close_button, 'mousedown', evt => {
         preventDefault(evt, true);
       });
@@ -4645,12 +4719,12 @@ function remove_button (userOptions) {
         // propagating will trigger the dropdown to show for single mode
         preventDefault(evt, true);
         if (self.isLocked) return;
-        var value = rendered.dataset.value;
-        self.removeItem(value);
+        if (!self.shouldDelete([item], evt)) return;
+        self.removeItem(item);
         self.refreshOptions(false);
         self.inputState();
       });
-      return rendered;
+      return item;
     };
   });
 }
@@ -4714,10 +4788,11 @@ function virtual_scroll () {
   var dropdown_content;
   var loading_more = false;
   var load_more_opt;
+  var default_values = [];
 
   if (!self.settings.shouldLoadMore) {
     // return true if additional results should be loaded
-    self.settings.shouldLoadMore = function () {
+    self.settings.shouldLoadMore = () => {
       const scroll_percent = dropdown_content.clientHeight / (dropdown_content.scrollHeight - dropdown_content.scrollTop);
 
       if (scroll_percent > 0.9) {
@@ -4749,7 +4824,7 @@ function virtual_scroll () {
     field: '$score'
   }]; // can we load more results for given query?
 
-  function canLoadMore(query) {
+  const canLoadMore = query => {
     if (typeof self.settings.maxOptions === 'number' && dropdown_content.children.length >= self.settings.maxOptions) {
       return false;
     }
@@ -4759,15 +4834,23 @@ function virtual_scroll () {
     }
 
     return false;
-  } // set the next url that will be
+  };
+
+  const clearFilter = (option, value) => {
+    if (self.items.indexOf(value) >= 0 || default_values.indexOf(value) >= 0) {
+      return true;
+    }
+
+    return false;
+  }; // set the next url that will be
 
 
-  self.setNextUrl = function (value, next_url) {
+  self.setNextUrl = (value, next_url) => {
     pagination[value] = next_url;
   }; // getUrl() to be used in settings.load()
 
 
-  self.getUrl = function (query) {
+  self.getUrl = query => {
     if (query in pagination) {
       const next_url = pagination[query];
       pagination[query] = false;
@@ -4801,7 +4884,7 @@ function virtual_scroll () {
 
   self.hook('instead', 'loadCallback', (options, optgroups) => {
     if (!loading_more) {
-      self.clearOptions();
+      self.clearOptions(clearFilter);
     } else if (load_more_opt && options.length > 0) {
       load_more_opt.dataset.value = options[0][self.settings.valueField];
     }
@@ -4839,18 +4922,19 @@ function virtual_scroll () {
   }); // add scroll listener and default templates
 
   self.on('initialize', () => {
+    default_values = Object.keys(self.options);
     dropdown_content = self.dropdown_content; // default templates
 
     self.settings.render = Object.assign({}, {
-      loading_more: function () {
+      loading_more: () => {
         return `<div class="loading-more-results">Loading more results ... </div>`;
       },
-      no_more_results: function () {
+      no_more_results: () => {
         return `<div class="no-more-results">No more results</div>`;
       }
     }, self.settings.render); // watch dropdown content scroll position
 
-    dropdown_content.addEventListener('scroll', function () {
+    dropdown_content.addEventListener('scroll', () => {
       if (!self.settings.shouldLoadMore.call(self)) {
         return;
       } // !important: this will get checked again in load() but we still need to check here otherwise loading_more will be set to true