fomantic-ui 2.9.4-beta.10 → 2.9.4-beta.101

package/dist/components/dropdown.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.4-beta.10+3564140 - Dropdown
+ * # Fomantic-UI 2.9.4-beta.101+96ed453 - Dropdown
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -426,7 +426,7 @@ select.ui.dropdown {
   box-shadow: 0 2px 3px 0 rgba(34, 36, 38, 0.15);
   transition: opacity 0.1s ease;
 }
-.ui.selection.dropdown:not(.pointing):not(.floating) .menu {
+.ui.selection.dropdown:not(.pointing):not(.floating) > .menu {
   border-top-width: 0;
   border-radius: 0 0 0.28571429rem 0.28571429rem;
 }
@@ -442,70 +442,70 @@ select.ui.dropdown {
   padding: 0.78571429rem 1.14285714rem;
 }
 @media only screen and (max-width: 767.98px) {
-  .ui.selection.dropdown.short .menu {
+  .ui.ui.selection.dropdown.short .menu {
     max-height: 6.01071429rem;
   }
-  .ui.selection.dropdown[class*="very short"] .menu {
+  .ui.ui.selection.dropdown[class*="very short"] .menu {
     max-height: 4.00714286rem;
   }
   .ui.selection.dropdown:not(.unlimited) .menu {
     max-height: 8.01428571rem;
   }
-  .ui.selection.dropdown.long .menu {
+  .ui.ui.selection.dropdown.long .menu {
     max-height: 16.02857143rem;
   }
-  .ui.selection.dropdown[class*="very long"] .menu {
+  .ui.ui.selection.dropdown[class*="very long"] .menu {
     max-height: 24.04285714rem;
   }
 }
 @media only screen and (min-width: 768px) {
-  .ui.selection.dropdown.short .menu {
+  .ui.ui.selection.dropdown.short .menu {
     max-height: 8.01428571rem;
   }
-  .ui.selection.dropdown[class*="very short"] .menu {
+  .ui.ui.selection.dropdown[class*="very short"] .menu {
     max-height: 5.34285714rem;
   }
   .ui.selection.dropdown:not(.unlimited) .menu {
     max-height: 10.68571429rem;
   }
-  .ui.selection.dropdown.long .menu {
+  .ui.ui.selection.dropdown.long .menu {
     max-height: 21.37142857rem;
   }
-  .ui.selection.dropdown[class*="very long"] .menu {
+  .ui.ui.selection.dropdown[class*="very long"] .menu {
     max-height: 32.05714286rem;
   }
 }
 @media only screen and (min-width: 992px) {
-  .ui.selection.dropdown.short .menu {
+  .ui.ui.selection.dropdown.short .menu {
     max-height: 12.02142857rem;
   }
-  .ui.selection.dropdown[class*="very short"] .menu {
+  .ui.ui.selection.dropdown[class*="very short"] .menu {
     max-height: 8.01428571rem;
   }
   .ui.selection.dropdown:not(.unlimited) .menu {
     max-height: 16.02857143rem;
   }
-  .ui.selection.dropdown.long .menu {
+  .ui.ui.selection.dropdown.long .menu {
     max-height: 32.05714286rem;
   }
-  .ui.selection.dropdown[class*="very long"] .menu {
+  .ui.ui.selection.dropdown[class*="very long"] .menu {
     max-height: 48.08571429rem;
   }
 }
 @media only screen and (min-width: 1920px) {
-  .ui.selection.dropdown.short .menu {
+  .ui.ui.selection.dropdown.short .menu {
     max-height: 16.02857143rem;
   }
-  .ui.selection.dropdown[class*="very short"] .menu {
+  .ui.ui.selection.dropdown[class*="very short"] .menu {
     max-height: 10.68571429rem;
   }
   .ui.selection.dropdown:not(.unlimited) .menu {
     max-height: 21.37142857rem;
   }
-  .ui.selection.dropdown.long .menu {
+  .ui.ui.selection.dropdown.long .menu {
     max-height: 42.74285714rem;
   }
-  .ui.selection.dropdown[class*="very long"] .menu {
+  .ui.ui.selection.dropdown[class*="very long"] .menu {
     max-height: 64.11428571rem;
   }
 }
@@ -701,7 +701,7 @@ select.ui.dropdown {
   opacity: 0.45;
 }
 .ui.active.search.dropdown input.search:focus + .text {
-  color: rgba(115, 115, 115, 0.87) !important;
+  color: rgba(115, 115, 115, 0.87);
 }
 .ui.search.dropdown.button > span.sizer {
   display: none;
@@ -755,13 +755,13 @@ select.ui.dropdown {
 .ui.inline.dropdown > .remove.icon {
   right: 2.2em;
 }
-.ui.clearable.dropdown .text,
-.ui.clearable.dropdown a:last-of-type {
+.ui.clearable.dropdown .text:not(.default),
+.ui.clearable.dropdown:not(.search) > .ui.label:last-of-type {
   margin-right: 1.5em;
 }
 .ui.dropdown select.noselection ~ .remove.icon,
 .ui.dropdown input[value=""] ~ .remove.icon,
-.ui.dropdown input:not([value]) ~ .remove.icon,
+.ui.dropdown input:not([value]):not(.search) ~ .remove.icon,
 .ui.dropdown.loading > .remove.icon {
   display: none;
 }
@@ -860,6 +860,9 @@ select.ui.dropdown {
   margin: 0.45238095em 0 0.45238095em 0.64285714em;
   line-height: 1.21428571em;
 }
+.ui.multiple.search.dropdown > .text.default {
+  z-index: -1;
+}
 .ui.multiple.search.dropdown > .label ~ .text {
   display: none;
 }
@@ -1284,7 +1287,7 @@ select.ui.dropdown {
 }
 
 /* Selection */
-.ui.ui.upward.selection.dropdown:not(.pointing):not(.floating) .menu {
+.ui.ui.upward.selection.dropdown:not(.pointing):not(.floating) > .menu {
   border-top-width: 1px;
   border-bottom-width: 0;
   box-shadow: 0 -2px 3px 0 rgba(0, 0, 0, 0.08);
@@ -1789,32 +1792,32 @@ select.ui.dropdown {
 .ui.dropdown .menu > .item {
   font-size: 1rem;
 }
-.ui.mini.dropdown,
-.ui.mini.dropdown .menu > .item {
+.ui.ui.mini.dropdown,
+.ui.ui.mini.dropdown .menu > .item {
   font-size: 0.78571429rem;
 }
-.ui.tiny.dropdown,
-.ui.tiny.dropdown .menu > .item {
+.ui.ui.tiny.dropdown,
+.ui.ui.tiny.dropdown .menu > .item {
   font-size: 0.85714286rem;
 }
-.ui.small.dropdown,
-.ui.small.dropdown .menu > .item {
+.ui.ui.small.dropdown,
+.ui.ui.small.dropdown .menu > .item {
   font-size: 0.92857143rem;
 }
-.ui.large.dropdown,
-.ui.large.dropdown .menu > .item {
+.ui.ui.large.dropdown,
+.ui.ui.large.dropdown .menu > .item {
   font-size: 1.14285714rem;
 }
-.ui.big.dropdown,
-.ui.big.dropdown .menu > .item {
+.ui.ui.big.dropdown,
+.ui.ui.big.dropdown .menu > .item {
   font-size: 1.28571429rem;
 }
-.ui.huge.dropdown,
-.ui.huge.dropdown .menu > .item {
+.ui.ui.huge.dropdown,
+.ui.ui.huge.dropdown .menu > .item {
   font-size: 1.42857143rem;
 }
-.ui.massive.dropdown,
-.ui.massive.dropdown .menu > .item {
+.ui.ui.massive.dropdown,
+.ui.ui.massive.dropdown .menu > .item {
   font-size: 1.71428571rem;
 }
 
@@ -1909,7 +1912,7 @@ select.ui.dropdown {
   opacity: 0.45;
 }
 .ui.inverted.active.search.dropdown input.search:focus + .text {
-  color: rgba(255, 255, 255, 0.7) !important;
+  color: rgba(255, 255, 255, 0.7);
 }
 .ui.dropdown .inverted.menu > .message:not(.ui),
 .ui.inverted.dropdown .menu > .message:not(.ui) {
@@ -1976,9 +1979,14 @@ select.ui.dropdown {
   scrollbar-shadow-color: #656565;
   scrollbar-track-color: #323232;
   scrollbar-arrow-color: #323232;
-  
+}
+@supports (-moz-appearance: none) {
+  .ui.dropdown .inverted.menu,
+  .ui.inverted.dropdown .menu {
+    
 /* firefox: first color thumb, second track */
-  scrollbar-color: rgba(255, 255, 255, 0.25) rgba(255, 255, 255, 0.1);
+    scrollbar-color: rgba(255, 255, 255, 0.25) rgba(255, 255, 255, 0.1);
+  }
 }
 .ui.pointing.dropdown > .inverted.menu::after,
 .ui.inverted.pointing.dropdown > .menu::after {

package/dist/components/dropdown.js

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.4-beta.10+3564140 - Dropdown
+ * # Fomantic-UI 2.9.4-beta.101+96ed453 - Dropdown
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -127,6 +127,9 @@
                             module.change.values(settings.values);
                             module.remove.initialLoad();
                         }
+                        if (module.get.placeholderText() !== '') {
+                            module.set.placeholderText();
+                        }
 
                         module.refreshData();
 
@@ -793,7 +796,7 @@
                                 }
                                 if (module.is.multiple()) {
                                     $.each(preSelected, function (index, value) {
-                                        $item.filter('[data-value="' + value + '"]')
+                                        $item.filter('[data-' + metadata.value + '="' + value + '"]')
                                             .addClass(className.filtered)
                                         ;
                                     });
@@ -890,11 +893,13 @@
                                 ? query
                                 : module.get.query()
                         ),
-                        results          =  null,
-                        escapedTerm      = module.escape.string(searchTerm),
-                        regExpFlags      = (settings.ignoreSearchCase ? 'i' : '') + 'gm',
+                        results = null,
+                        escapedTerm = module.escape.string(searchTerm),
+                        regExpIgnore = settings.ignoreSearchCase ? 'i' : '',
+                        regExpFlags = regExpIgnore + 'gm',
                         beginsWithRegExp = new RegExp('^' + escapedTerm, regExpFlags)
                     ;
+                    module.remove.filteredItem();
                     // avoid loop if we're matching nothing
                     if (module.has.query()) {
                         results = [];
@@ -938,12 +943,34 @@
                         ;
                     }
                     module.debug('Showing only matched items', searchTerm);
-                    module.remove.filteredItem();
                     if (results) {
                         $item
                             .not(results)
                             .addClass(className.filtered)
                         ;
+                        if (settings.highlightMatches && (settings.match === 'both' || settings.match === 'text')) {
+                            var querySplit = query.split(''),
+                                diacriticReg = settings.ignoreDiacritics ? '[\u0300-\u036F]?' : '',
+                                htmlReg = '(?![^<]*>)',
+                                markedRegExp = new RegExp(htmlReg + '(' + querySplit.join(diacriticReg + ')(.*?)' + htmlReg + '(') + diacriticReg + ')', regExpIgnore),
+                                markedReplacer = function () {
+                                    var args = [].slice.call(arguments, 1, querySplit.length * 2).map(function (x, i) {
+                                        return i & 1 ? x : '<mark>' + x + '</mark>'; // eslint-disable-line no-bitwise
+                                    });
+
+                                    return args.join('');
+                                }
+                            ;
+                            $.each(results, function (index, result) {
+                                var $result = $(result),
+                                    markedHTML = module.get.choiceText($result, true)
+                                ;
+                                if (settings.ignoreDiacritics) {
+                                    markedHTML = markedHTML.normalize('NFD');
+                                }
+                                $result.html(markedHTML.replace(markedRegExp, markedReplacer));
+                            });
+                        }
                     }
 
                     if (!module.has.query()) {
@@ -979,8 +1006,10 @@
                         termLength  = term.length,
                         queryLength = query.length
                     ;
-                    query = settings.ignoreSearchCase ? query.toLowerCase() : query;
-                    term = settings.ignoreSearchCase ? term.toLowerCase() : term;
+                    if (settings.ignoreSearchCase) {
+                        query = query.toLowerCase();
+                        term = term.toLowerCase();
+                    }
                     if (queryLength > termLength) {
                         return false;
                     }
@@ -1187,7 +1216,7 @@
                                 if (!itemActivated && !pageLostFocus) {
                                     if (settings.forceSelection) {
                                         module.forceSelection();
-                                    } else if (!settings.allowAdditions) {
+                                    } else if (!settings.allowAdditions && !settings.keepSearchTerm && !module.has.menuSearch()) {
                                         module.remove.searchTerm();
                                     }
                                     module.hide();
@@ -1202,7 +1231,9 @@
                             if (module.is.searchSelection()) {
                                 module.remove.searchTerm();
                             }
-                            module.hide();
+                            if (settings.collapseOnClearable) {
+                                module.hide();
+                            }
                             event.stopPropagation();
                         },
                     },
@@ -1236,7 +1267,9 @@
                             module.set.filtered();
                         }
                         clearTimeout(module.timer);
-                        module.timer = setTimeout(function () { module.search(); }, settings.delay.search);
+                        module.timer = setTimeout(function () {
+                            module.search();
+                        }, settings.delay.search);
                     },
                     label: {
                         click: function (event) {
@@ -1413,7 +1446,9 @@
                                         module.remove.userAddition();
                                     }
                                     if (!settings.keepSearchTerm) {
-                                        module.remove.filteredItem();
+                                        if (module.is.multiple()) {
+                                            module.remove.filteredItem();
+                                        }
                                         module.remove.searchTerm();
                                     }
                                     if (!module.is.visible() && $target.length > 0) {
@@ -1585,7 +1620,7 @@
                                     module.verbose('Selecting item from keyboard shortcut', $selectedItem);
                                     module.event.item.click.call($selectedItem, event);
                                 }
-                                if (module.is.searchSelection()) {
+                                if (module.is.searchSelection() && !settings.keepSearchTerm) {
                                     module.remove.searchTerm();
                                 }
                                 if (module.is.multiple()) {
@@ -2587,7 +2622,7 @@
                             } else {
                                 $combo.text(text);
                             }
-                        } else if (settings.action === 'activate') {
+                        } else if (settings.action === 'activate' || isFunction(settings.action)) {
                             if (text !== module.get.placeholderText() || isNotPlaceholder) {
                                 $text.removeClass(className.placeholder);
                             }
@@ -2647,7 +2682,7 @@
                             module.set.scrollPosition($nextValue);
                             $selectedItem.removeClass(className.selected);
                             $nextValue.addClass(className.selected);
-                            if (settings.selectOnKeydown && module.is.single() && !$nextItem.hasClass(className.actionable)) {
+                            if (settings.selectOnKeydown && module.is.single() && (!$nextItem || !$nextItem.hasClass(className.actionable))) {
                                 module.set.selectedItem($nextValue);
                             }
                         }
@@ -2768,19 +2803,27 @@
                         $selectedItem = settings.allowAdditions
                             ? $selectedItem || module.get.itemWithAdditions(value)
                             : $selectedItem || module.get.item(value);
-                        if (!$selectedItem) {
+                        if (!$selectedItem && value !== undefined) {
                             return false;
                         }
-                        module.debug('Setting selected menu item to', $selectedItem);
-                        if (module.is.multiple() && !keepSearchTerm) {
-                            module.remove.searchWidth();
-                        }
-                        if (module.is.single()) {
+                        if (isMultiple) {
+                            if (!keepSearchTerm) {
+                                module.remove.searchWidth();
+                            }
+                            if (settings.useLabels) {
+                                module.remove.selectedItem();
+                                if (value === undefined) {
+                                    module.remove.labels($module.find(selector.label), true);
+                                }
+                            }
+                        } else {
                             module.remove.activeItem();
                             module.remove.selectedItem();
-                        } else if (settings.useLabels) {
-                            module.remove.selectedItem();
                         }
+                        if (!$selectedItem) {
+                            return false;
+                        }
+                        module.debug('Setting selected menu item to', $selectedItem);
                         // select each item
                         $selectedItem
                             .each(function () {
@@ -3080,6 +3123,12 @@
                         $item.removeClass(className.active);
                     },
                     filteredItem: function () {
+                        if (settings.highlightMatches) {
+                            $.each($item, function (index, item) {
+                                var $markItem = $(item);
+                                $markItem.html($markItem.html().replace(/<\/?mark>/g, ''));
+                            });
+                        }
                         if (settings.useLabels && module.has.maxSelections()) {
                             return;
                         }
@@ -3424,7 +3473,12 @@
                         return $selectedMenu.hasClass(className.leftward);
                     },
                     clearable: function () {
-                        return $module.hasClass(className.clearable) || settings.clearable;
+                        var hasClearableClass = $module.hasClass(className.clearable);
+                        if (!hasClearableClass && settings.clearable) {
+                            $module.addClass(className.clearable);
+                        }
+
+                        return hasClearableClass || settings.clearable;
                     },
                     disabled: function () {
                         return $module.hasClass(className.disabled);
@@ -3747,12 +3801,16 @@
                     show: function () {
                         module.verbose('Delaying show event to ensure user intent');
                         clearTimeout(module.timer);
-                        module.timer = setTimeout(function () { module.show(); }, settings.delay.show);
+                        module.timer = setTimeout(function () {
+                            module.show();
+                        }, settings.delay.show);
                     },
                     hide: function () {
                         module.verbose('Delaying hide event to ensure user intent');
                         clearTimeout(module.timer);
-                        module.timer = setTimeout(function () { module.hide(); }, settings.delay.hide);
+                        module.timer = setTimeout(function () {
+                            module.hide();
+                        }, settings.delay.hide);
                     },
                 },
 
@@ -3785,6 +3843,7 @@
                         return text.replace(regExp.escape, '\\$&');
                     },
                     htmlEntities: function (string, forceAmpersand) {
+                        forceAmpersand = typeof forceAmpersand === 'number' ? false : forceAmpersand;
                         var
                             badChars     = /["'<>`]/g,
                             shouldEscape = /["&'<>`]/,
@@ -3801,8 +3860,7 @@
                         ;
                         if (shouldEscape.test(string)) {
                             string = string.replace(forceAmpersand ? /&/g : /&(?![\d#a-z]{1,12};)/gi, '&amp;');
-
-                            return string.replace(badChars, escapedChar);
+                            string = string.replace(badChars, escapedChar);
                         }
 
                         return string;
@@ -3878,7 +3936,9 @@
                             });
                         }
                         clearTimeout(module.performance.timer);
-                        module.performance.timer = setTimeout(function () { module.performance.display(); }, 500);
+                        module.performance.timer = setTimeout(function () {
+                            module.performance.display();
+                        }, 500);
                     },
                     display: function () {
                         var
@@ -4005,6 +4065,7 @@
 
         match: 'both', // what to match against with search selection (both, text, or label)
         fullTextSearch: 'exact', // search anywhere in value (set to 'exact' to require exact matches)
+        highlightMatches: false, // Whether search result should highlight matching strings
         ignoreDiacritics: false, // match results also if they contain diacritics of the same base character (for example searching for "a" will also match "á" or "â" or "à", etc...)
         hideDividers: false, // Whether to hide any divider elements (specified in selector.divider) that are sibling to any items when searched (set to true will hide all dividers, set to 'empty' will hide them when they are not followed by a visible item)
 
@@ -4038,6 +4099,7 @@
         headerDivider: true, // whether option headers should have an additional divider line underneath when converted from <select> <optgroup>
 
         collapseOnActionable: true, // whether the dropdown should collapse upon selection of an actionable item
+        collapseOnClearable: false, // whether the dropdown should collapse upon clicking the clearable icon
 
         // label settings on multi-select
         label: {
@@ -4120,9 +4182,11 @@
             descriptionVertical: 'descriptionVertical', // whether description should be vertical
             value: 'value', // actual dropdown value
             text: 'text', // displayed text when selected
+            data: 'data', // custom data attributes
             type: 'type', // type of dropdown element
             image: 'image', // optional image path
             imageClass: 'imageClass', // optional individual class for image
+            alt: 'alt', // optional alt text for image
             icon: 'icon', // optional icon name
             iconClass: 'iconClass', // optional individual class for icon (for example to use flag instead)
             class: 'class', // optional individual class for item/header
@@ -4229,8 +4293,7 @@
             ;
             if (shouldEscape.test(string)) {
                 string = string.replace(/&(?![\d#a-z]{1,12};)/gi, '&amp;');
-
-                return string.replace(badChars, escapedChar);
+                string = string.replace(badChars, escapedChar);
             }
 
             return string;
@@ -4265,9 +4328,21 @@
             $.each(values, function (index, option) {
                 var
                     itemType = option[fields.type] || 'item',
-                    isMenu = itemType.indexOf('menu') !== -1
+                    isMenu = itemType.indexOf('menu') !== -1,
+                    maybeData = '',
+                    dataObject = option[fields.data]
                 ;
-
+                if (dataObject) {
+                    var dataKey,
+                        dataKeyEscaped
+                    ;
+                    for (dataKey in dataObject) {
+                        dataKeyEscaped = String(dataKey).replace(/\W/g, '');
+                        if (Object.prototype.hasOwnProperty.call(dataObject, dataKey) && ['text', 'value'].indexOf(dataKeyEscaped.toLowerCase()) === -1) {
+                            maybeData += ' data-' + dataKeyEscaped + '="' + deQuote(String(dataObject[dataKey])) + '"';
+                        }
+                    }
+                }
                 if (itemType === 'item' || isMenu) {
                     var
                         maybeText = option[fields.text]
@@ -4284,12 +4359,12 @@
                             : '',
                         hasDescription = escape(option[fields.description] || '', preserveHTML) !== ''
                     ;
-                    html += '<div class="' + deQuote(maybeActionable + maybeDisabled + maybeDescriptionVertical + (option[fields.class] || className.item)) + '" data-value="' + deQuote(option[fields.value], true) + '"' + maybeText + '>';
+                    html += '<div class="' + deQuote(maybeActionable + maybeDisabled + maybeDescriptionVertical + (option[fields.class] || className.item)) + '" data-value="' + deQuote(option[fields.value], true) + '"' + maybeText + maybeData + '>';
                     if (isMenu) {
                         html += '<i class="' + (itemType.indexOf('left') !== -1 ? 'left' : '') + ' dropdown icon"></i>';
                     }
                     if (option[fields.image]) {
-                        html += '<img class="' + deQuote(option[fields.imageClass] || className.image) + '" src="' + deQuote(option[fields.image]) + '">';
+                        html += '<img class="' + deQuote(option[fields.imageClass] || className.image) + '" src="' + deQuote(option[fields.image]) + (option[fields.alt] ? '" alt="' + deQuote(option[fields.alt]) : '') + '">';
                     }
                     if (option[fields.icon]) {
                         html += '<i class="' + deQuote(option[fields.icon] + ' ' + (option[fields.iconClass] || className.icon)) + '"></i>';