govuk_publishing_components 65.1.0 → 65.2.0

data/node_modules/choices.js/public/assets/scripts/choices.js

@@ -1,4 +1,4 @@
-/*! choices.js v11.1.0 | © 2025 Josh Johnson | https://github.com/jshjohnson/Choices#readme */
+/*! choices.js v11.2.1 | © 2026 Josh Johnson | https://github.com/Choices-js/Choices#readme */
 
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -217,9 +217,6 @@
             return firstChild;
         };
     })();
-    var resolveNoticeFunction = function (fn, value) {
-        return typeof fn === 'function' ? fn(sanitise(value), value) : fn;
-    };
     var resolveStringFunction = function (fn) {
         return typeof fn === 'function' ? fn() : fn;
     };
@@ -251,6 +248,26 @@
         }
         return '';
     };
+    var getChoiceForOutput = function (choice, keyCode) {
+        return {
+            id: choice.id,
+            highlighted: choice.highlighted,
+            labelClass: choice.labelClass,
+            labelDescription: unwrapStringForRaw(choice.labelDescription),
+            customProperties: choice.customProperties,
+            disabled: choice.disabled,
+            active: choice.active,
+            label: choice.label,
+            placeholder: choice.placeholder,
+            value: choice.value,
+            groupValue: choice.group ? choice.group.label : undefined,
+            element: choice.element,
+            keyCode: keyCode,
+        };
+    };
+    var resolveNoticeFunction = function (fn, value, item) {
+        return typeof fn === 'function' ? fn(sanitise(value), unwrapStringForRaw(value), item) : fn;
+    };
     var escapeForTemplate = function (allowHTML, s) {
         return allowHTML ? unwrapStringForEscaped(s) : sanitise(s);
     };
@@ -418,6 +435,12 @@
         Container.prototype.removeFocusState = function () {
             removeClassesFromElement(this.element, this.classNames.focusState);
         };
+        Container.prototype.addInvalidState = function () {
+            addClassesToElement(this.element, this.classNames.invalidState);
+        };
+        Container.prototype.removeInvalidState = function () {
+            removeClassesFromElement(this.element, this.classNames.invalidState);
+        };
         Container.prototype.enable = function () {
             removeClassesFromElement(this.element, this.classNames.disabledState);
             this.element.removeAttribute('aria-disabled');
@@ -883,7 +906,9 @@
                 highlighted: false,
                 placeholder: this.extractPlaceholder && (!option.value || option.hasAttribute('placeholder')),
                 labelClass: typeof option.dataset.labelClass !== 'undefined' ? stringToHtmlClass(option.dataset.labelClass) : undefined,
-                labelDescription: typeof option.dataset.labelDescription !== 'undefined' ? option.dataset.labelDescription : undefined,
+                labelDescription: typeof option.dataset.labelDescription !== 'undefined'
+                    ? { trusted: option.dataset.labelDescription }
+                    : undefined,
                 customProperties: parseCustomProperties(option.dataset.customProperties),
             };
         };
@@ -929,6 +954,7 @@
         selectedState: ['is-selected'],
         flippedState: ['is-flipped'],
         loadingState: ['is-loading'],
+        invalidState: ['is-invalid'],
         notice: ['choices__notice'],
         addChoice: ['choices__item--selectable', 'add-choice'],
         noResults: ['has-no-results'],
@@ -956,6 +982,7 @@
         paste: true,
         searchEnabled: true,
         searchChoices: true,
+        searchDisabledChoices: false,
         searchFloor: 1,
         searchResultLimit: 4,
         searchFields: ['label', 'value'],
@@ -971,6 +998,7 @@
         prependValue: null,
         appendValue: null,
         renderSelectedChoices: 'auto',
+        searchRenderSelectedChoices: true,
         loadingText: 'Loading...',
         noResultsText: 'No results found',
         noChoicesText: 'No choices to choose from',
@@ -979,7 +1007,9 @@
         customAddItemText: 'Only values matching specific conditions can be added',
         addItemText: function (value) { return "Press Enter to add <b>\"".concat(value, "\"</b>"); },
         removeItemIconText: function () { return "Remove item"; },
-        removeItemLabelText: function (value) { return "Remove item: ".concat(value); },
+        removeItemLabelText: function (value, _valueRaw, i) {
+            return "Remove item: ".concat(i ? sanitise(i.label) : value);
+        },
         maxItemText: function (maxItemCount) { return "Only ".concat(maxItemCount, " values can be added"); },
         valueComparer: function (value1, value2) { return value1 === value2; },
         fuseOptions: {
@@ -1280,7 +1310,8 @@
              * Get choices that can be searched (excluding placeholders or disabled choices)
              */
             get: function () {
-                return this.choices.filter(function (choice) { return !choice.disabled && !choice.placeholder; });
+                var context = this._context;
+                return this.choices.filter(function (choice) { return !choice.placeholder && (context.searchDisabledChoices || !choice.disabled); });
             },
             enumerable: false,
             configurable: true
@@ -1338,9 +1369,9 @@
     function _defineProperty(e, r, t) {
       return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
         value: t,
-        enumerable: !0,
-        configurable: !0,
-        writable: !0
+        enumerable: true,
+        configurable: true,
+        writable: true
       }) : e[r] = t, e;
     }
     function ownKeys(e, r) {
@@ -1356,7 +1387,7 @@
     function _objectSpread2(e) {
       for (var r = 1; r < arguments.length; r++) {
         var t = null != arguments[r] ? arguments[r] : {};
-        r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
+        r % 2 ? ownKeys(Object(t), true).forEach(function (r) {
           _defineProperty(e, r, t[r]);
         }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
           Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
@@ -1368,7 +1399,7 @@
       if ("object" != typeof t || !t) return t;
       var e = t[Symbol.toPrimitive];
       if (void 0 !== e) {
-        var i = e.call(t, r || "default");
+        var i = e.call(t, r);
         if ("object" != typeof i) return i;
         throw new TypeError("@@toPrimitive must return a primitive value.");
       }
@@ -1391,16 +1422,13 @@
     function isArray(value) {
       return !Array.isArray ? getTag(value) === '[object Array]' : Array.isArray(value);
     }
-
-    // Adapted from: https://github.com/lodash/lodash/blob/master/.internal/baseToString.js
-    const INFINITY = 1 / 0;
     function baseToString(value) {
       // Exit early for strings to avoid a performance hit in some environments.
       if (typeof value == 'string') {
         return value;
       }
       let result = value + '';
-      return result == '0' && 1 / value == -INFINITY ? '-0' : result;
+      return result == '0' && 1 / value == -Infinity ? '-0' : result;
     }
     function toString(value) {
       return value == null ? '' : baseToString(value);
@@ -1436,7 +1464,6 @@
     function getTag(value) {
       return value == null ? value === undefined ? '[object Undefined]' : '[object Null]' : Object.prototype.toString.call(value);
     }
-    const EXTENDED_SEARCH_UNAVAILABLE = 'Extended search is not available';
     const INCORRECT_INDEX_TYPE = "Incorrect 'index' type";
     const LOGICAL_SEARCH_INVALID_QUERY_FOR_KEY = key => `Invalid value for key ${key}`;
     const PATTERN_LENGTH_TOO_LARGE = max => `Pattern length exceeds max of ${max}.`;
@@ -2690,9 +2717,7 @@
     class Fuse {
       constructor(docs, options = {}, index) {
         this.options = _objectSpread2(_objectSpread2({}, Config), options);
-        if (this.options.useExtendedSearch && !true) {
-          throw new Error(EXTENDED_SEARCH_UNAVAILABLE);
-        }
+        if (this.options.useExtendedSearch && false) ;
         this._keyStore = new KeyStore(this.options.keys);
         this.setCollection(docs, index);
       }
@@ -3024,7 +3049,7 @@
             dataset.labelClass = getClassNames(labelClass).join(' ');
         }
         if (labelDescription) {
-            dataset.labelDescription = labelDescription;
+            dataset.labelDescription = unwrapStringForRaw(labelDescription);
         }
         if (withCustomProperties && customProperties) {
             if (typeof customProperties === 'string') {
@@ -3131,8 +3156,9 @@
                 var removeButton = document.createElement('button');
                 removeButton.type = 'button';
                 addClassesToElement(removeButton, button);
-                setElementHtml(removeButton, true, resolveNoticeFunction(removeItemIconText, choice.value));
-                var REMOVE_ITEM_LABEL = resolveNoticeFunction(removeItemLabelText, choice.value);
+                var eventChoice = getChoiceForOutput(choice);
+                setElementHtml(removeButton, true, resolveNoticeFunction(removeItemIconText, choice.value, eventChoice));
+                var REMOVE_ITEM_LABEL = resolveNoticeFunction(removeItemLabelText, choice.value, eventChoice);
                 if (REMOVE_ITEM_LABEL) {
                     removeButton.setAttribute('aria-label', REMOVE_ITEM_LABEL);
                 }
@@ -3237,6 +3263,7 @@
             else {
                 addClassesToElement(div, itemSelectable);
                 div.dataset.choiceSelectable = '';
+                div.setAttribute('aria-selected', choice.selected ? 'true' : 'false');
             }
             return div;
         },
@@ -3406,7 +3433,7 @@
             this.initialised = false;
             this._store = new Store(config);
             this._currentValue = '';
-            config.searchEnabled = (!isText && config.searchEnabled) || isSelectMultiple;
+            config.searchEnabled = !isText && config.searchEnabled;
             this._canSearch = config.searchEnabled;
             this._isScrollingOnIe = false;
             this._highlightPosition = 0;
@@ -3446,6 +3473,8 @@
             this._onEscapeKey = this._onEscapeKey.bind(this);
             this._onDirectionKey = this._onDirectionKey.bind(this);
             this._onDeleteKey = this._onDeleteKey.bind(this);
+            this._onChange = this._onChange.bind(this);
+            this._onInvalid = this._onInvalid.bind(this);
             // If element has already been initialised with Choices, fail silently
             if (this.passedElement.isActive) {
                 if (!config.silent) {
@@ -3552,7 +3581,7 @@
             }
             this._store.dispatch(highlightItem(choice, true));
             if (runEvent) {
-                this.passedElement.triggerEvent(EventType.highlightItem, this._getChoiceForOutput(choice));
+                this.passedElement.triggerEvent(EventType.highlightItem, getChoiceForOutput(choice));
             }
             return this;
         };
@@ -3567,7 +3596,7 @@
             }
             this._store.dispatch(highlightItem(choice, false));
             if (runEvent) {
-                this.passedElement.triggerEvent(EventType.unhighlightItem, this._getChoiceForOutput(choice));
+                this.passedElement.triggerEvent(EventType.unhighlightItem, getChoiceForOutput(choice));
             }
             return this;
         };
@@ -3577,7 +3606,7 @@
                 _this._store.items.forEach(function (item) {
                     if (!item.highlighted) {
                         _this._store.dispatch(highlightItem(item, true));
-                        _this.passedElement.triggerEvent(EventType.highlightItem, _this._getChoiceForOutput(item));
+                        _this.passedElement.triggerEvent(EventType.highlightItem, getChoiceForOutput(item));
                     }
                 });
             });
@@ -3589,7 +3618,7 @@
                 _this._store.items.forEach(function (item) {
                     if (item.highlighted) {
                         _this._store.dispatch(highlightItem(item, false));
-                        _this.passedElement.triggerEvent(EventType.highlightItem, _this._getChoiceForOutput(item));
+                        _this.passedElement.triggerEvent(EventType.highlightItem, getChoiceForOutput(item));
                     }
                 });
             });
@@ -3644,6 +3673,11 @@
                     _this.input.focus();
                 }
                 _this.passedElement.triggerEvent(EventType.showDropdown);
+                var activeElement = _this.choiceList.element.querySelector(getClassNamesSelector(_this.config.classNames.selectedState));
+                if (activeElement !== null && !isScrolledIntoView(activeElement, _this.choiceList.element)) {
+                    // We use the native scrollIntoView function instead of choiceList.scrollToChildElement to avoid animated scroll.
+                    activeElement.scrollIntoView();
+                }
             });
             return this;
         };
@@ -3652,6 +3686,7 @@
             if (!this.dropdown.isActive) {
                 return this;
             }
+            this._removeHighlightedChoices();
             requestAnimationFrame(function () {
                 _this.dropdown.hide();
                 _this.containerOuter.close();
@@ -3664,9 +3699,8 @@
             return this;
         };
         Choices.prototype.getValue = function (valueOnly) {
-            var _this = this;
             var values = this._store.items.map(function (item) {
-                return (valueOnly ? item.value : _this._getChoiceForOutput(item));
+                return (valueOnly ? item.value : getChoiceForOutput(item));
             });
             return this._isSelectOneElement || this.config.singleModeForMultiSelect ? values[0] : values;
         };
@@ -3924,7 +3958,7 @@
             // @todo integrate with Store
             this._searcher.reset();
             if (choice.selected) {
-                this.passedElement.triggerEvent(EventType.removeItem, this._getChoiceForOutput(choice));
+                this.passedElement.triggerEvent(EventType.removeItem, getChoiceForOutput(choice));
             }
             return this;
         };
@@ -4007,13 +4041,7 @@
             }
             var _a = this, config = _a.config, isSearching = _a._isSearching;
             var _b = this._store, activeGroups = _b.activeGroups, activeChoices = _b.activeChoices;
-            var renderLimit = 0;
-            if (isSearching && config.searchResultLimit > 0) {
-                renderLimit = config.searchResultLimit;
-            }
-            else if (config.renderChoiceLimit > 0) {
-                renderLimit = config.renderChoiceLimit;
-            }
+            var renderLimit = isSearching ? config.searchResultLimit : config.renderChoiceLimit;
             if (this._isSelectElement) {
                 var backingOptions = activeChoices.filter(function (choice) { return !choice.element; });
                 if (backingOptions.length) {
@@ -4023,11 +4051,16 @@
             var fragment = document.createDocumentFragment();
             var renderableChoices = function (choices) {
                 return choices.filter(function (choice) {
-                    return !choice.placeholder && (isSearching ? !!choice.rank : config.renderSelectedChoices || !choice.selected);
+                    return !choice.placeholder &&
+                        (isSearching
+                            ? (config.searchRenderSelectedChoices || !choice.selected) && !!choice.rank
+                            : config.renderSelectedChoices || !choice.selected);
                 });
             };
+            var showLabel = config.appendGroupInSearch && isSearching;
             var selectableChoices = false;
-            var renderChoices = function (choices, withinGroup, groupLabel) {
+            var highlightedEl = null;
+            var renderChoices = function (choices, withinGroup) {
                 if (isSearching) {
                     // sortByRank is used to ensure stable sorting, as scores are non-unique
                     // this additionally ensures fuseOptions.sortFn is not ignored
@@ -4037,16 +4070,20 @@
                     choices.sort(config.sorter);
                 }
                 var choiceLimit = choices.length;
-                choiceLimit = !withinGroup && renderLimit && choiceLimit > renderLimit ? renderLimit : choiceLimit;
+                choiceLimit = !withinGroup && renderLimit > 0 && choiceLimit > renderLimit ? renderLimit : choiceLimit;
                 choiceLimit--;
                 choices.every(function (choice, index) {
                     // choiceEl being empty signals the contents has probably significantly changed
-                    var dropdownItem = choice.choiceEl || _this._templates.choice(config, choice, config.itemSelectText, groupLabel);
+                    var dropdownItem = choice.choiceEl ||
+                        _this._templates.choice(config, choice, config.itemSelectText, showLabel && choice.group ? choice.group.label : undefined);
                     choice.choiceEl = dropdownItem;
                     fragment.appendChild(dropdownItem);
                     if (isSearching || !choice.selected) {
                         selectableChoices = true;
                     }
+                    else if (!highlightedEl) {
+                        highlightedEl = dropdownItem;
+                    }
                     return index < choiceLimit;
                 });
             };
@@ -4056,7 +4093,7 @@
                 }
                 if (!this._hasNonChoicePlaceholder && !isSearching && this._isSelectOneElement) {
                     // If we have a placeholder choice along with groups
-                    renderChoices(activeChoices.filter(function (choice) { return choice.placeholder && !choice.group; }), false, undefined);
+                    renderChoices(activeChoices.filter(function (choice) { return choice.placeholder && !choice.group; }), false);
                 }
                 // If we have grouped options
                 if (activeGroups.length && !isSearching) {
@@ -4065,7 +4102,7 @@
                     }
                     // render Choices without group first, regardless of sort, otherwise they won't be distinguishable
                     // from the last group
-                    renderChoices(activeChoices.filter(function (choice) { return !choice.placeholder && !choice.group; }), false, undefined);
+                    renderChoices(activeChoices.filter(function (choice) { return !choice.placeholder && !choice.group; }), false);
                     activeGroups.forEach(function (group) {
                         var groupChoices = renderableChoices(group.choices);
                         if (groupChoices.length) {
@@ -4075,12 +4112,12 @@
                                 dropdownGroup.remove();
                                 fragment.appendChild(dropdownGroup);
                             }
-                            renderChoices(groupChoices, true, config.appendGroupInSearch && isSearching ? group.label : undefined);
+                            renderChoices(groupChoices, true);
                         }
                     });
                 }
                 else {
-                    renderChoices(renderableChoices(activeChoices), false, undefined);
+                    renderChoices(renderableChoices(activeChoices), false);
                 }
             }
             if (!selectableChoices && (isSearching || !fragment.children.length || !config.renderSelectedChoices)) {
@@ -4094,9 +4131,7 @@
             }
             this._renderNotice(fragment);
             this.choiceList.element.replaceChildren(fragment);
-            if (selectableChoices) {
-                this._highlightChoice();
-            }
+            this._highlightChoice(highlightedEl);
         };
         Choices.prototype._renderItems = function () {
             var _this = this;
@@ -4206,23 +4241,12 @@
                 }
             }
         };
+        /**
+         * @deprecated Use utils.getChoiceForOutput
+         */
         // eslint-disable-next-line class-methods-use-this
         Choices.prototype._getChoiceForOutput = function (choice, keyCode) {
-            return {
-                id: choice.id,
-                highlighted: choice.highlighted,
-                labelClass: choice.labelClass,
-                labelDescription: choice.labelDescription,
-                customProperties: choice.customProperties,
-                disabled: choice.disabled,
-                active: choice.active,
-                label: choice.label,
-                placeholder: choice.placeholder,
-                value: choice.value,
-                groupValue: choice.group ? choice.group.label : undefined,
-                element: choice.element,
-                keyCode: keyCode,
-            };
+            return getChoiceForOutput(choice, keyCode);
         };
         Choices.prototype._triggerChange = function (value) {
             if (value === undefined || value === null) {
@@ -4238,7 +4262,7 @@
             if (!items.length || !this.config.removeItems || !this.config.removeItemButton) {
                 return;
             }
-            var id = element && parseDataSetId(element.parentElement);
+            var id = element && parseDataSetId(element.closest('[data-id]'));
             var itemToRemove = id && items.find(function (item) { return item.id === id; });
             if (!itemToRemove) {
                 return;
@@ -4427,7 +4451,7 @@
             var notice = '';
             if (canAddItem && typeof config.addItemFilter === 'function' && !config.addItemFilter(value)) {
                 canAddItem = false;
-                notice = resolveNoticeFunction(config.customAddItemText, value);
+                notice = resolveNoticeFunction(config.customAddItemText, value, undefined);
             }
             if (canAddItem) {
                 var foundChoice = this._store.choices.find(function (choice) { return config.valueComparer(choice.value, value); });
@@ -4439,12 +4463,12 @@
                     }
                     if (!config.duplicateItemsAllowed) {
                         canAddItem = false;
-                        notice = resolveNoticeFunction(config.uniqueItemText, value);
+                        notice = resolveNoticeFunction(config.uniqueItemText, value, undefined);
                     }
                 }
             }
             if (canAddItem) {
-                notice = resolveNoticeFunction(config.addItemText, value);
+                notice = resolveNoticeFunction(config.addItemText, value, undefined);
             }
             if (notice) {
                 this._displayNotice(notice, NoticeTypes.addChoice);
@@ -4495,6 +4519,7 @@
             var documentElement = this._docRoot;
             var outerElement = this.containerOuter.element;
             var inputElement = this.input.element;
+            var passedElement = this.passedElement.element;
             // capture events - can cancel event processing or propagation
             documentElement.addEventListener('touchend', this._onTouchEnd, true);
             outerElement.addEventListener('keydown', this._onKeyDown, true);
@@ -4532,12 +4557,21 @@
                     passive: true,
                 });
             }
+            if (passedElement.hasAttribute('required')) {
+                passedElement.addEventListener('change', this._onChange, {
+                    passive: true,
+                });
+                passedElement.addEventListener('invalid', this._onInvalid, {
+                    passive: true,
+                });
+            }
             this.input.addEventListeners();
         };
         Choices.prototype._removeEventListeners = function () {
             var documentElement = this._docRoot;
             var outerElement = this.containerOuter.element;
             var inputElement = this.input.element;
+            var passedElement = this.passedElement.element;
             documentElement.removeEventListener('touchend', this._onTouchEnd, true);
             outerElement.removeEventListener('keydown', this._onKeyDown, true);
             outerElement.removeEventListener('mousedown', this._onMouseDown, true);
@@ -4555,6 +4589,10 @@
             if (inputElement.form) {
                 inputElement.form.removeEventListener('reset', this._onFormReset);
             }
+            if (passedElement.hasAttribute('required')) {
+                passedElement.removeEventListener('change', this._onChange);
+                passedElement.removeEventListener('invalid', this._onInvalid);
+            }
             this.input.removeEventListeners();
         };
         Choices.prototype._onKeyDown = function (event) {
@@ -4804,7 +4842,7 @@
          */
         Choices.prototype._onMouseDown = function (event) {
             var target = event.target;
-            if (!(target instanceof HTMLElement)) {
+            if (!(target instanceof Element)) {
                 return;
             }
             // If we have our mouse down on the scrollbar and are on IE11...
@@ -4913,7 +4951,7 @@
                     // Remove the focus state when the past outerContainer was the target
                     containerOuter.removeFocusState();
                     // Also close the dropdown if search is disabled
-                    if (!this._canSearch) {
+                    if (!this.config.searchEnabled) {
                         this.hideDropdown(true);
                     }
                 }
@@ -4937,13 +4975,19 @@
                 }
             });
         };
-        Choices.prototype._highlightChoice = function (el) {
-            if (el === void 0) { el = null; }
-            var choices = Array.from(this.dropdown.element.querySelectorAll(selectableChoiceIdentifier));
-            if (!choices.length) {
+        Choices.prototype._onChange = function (event) {
+            if (!event.target.checkValidity()) {
                 return;
             }
-            var passedEl = el;
+            this.containerOuter.removeInvalidState();
+        };
+        Choices.prototype._onInvalid = function () {
+            this.containerOuter.addInvalidState();
+        };
+        /**
+         * Removes any highlighted choice options
+         */
+        Choices.prototype._removeHighlightedChoices = function () {
             var highlightedState = this.config.classNames.highlightedState;
             var highlightedChoices = Array.from(this.dropdown.element.querySelectorAll(getClassNamesSelector(highlightedState)));
             // Remove any highlighted choices
@@ -4951,6 +4995,16 @@
                 removeClassesFromElement(choice, highlightedState);
                 choice.setAttribute('aria-selected', 'false');
             });
+        };
+        Choices.prototype._highlightChoice = function (el) {
+            if (el === void 0) { el = null; }
+            var choices = Array.from(this.dropdown.element.querySelectorAll(selectableChoiceIdentifier));
+            if (!choices.length) {
+                return;
+            }
+            var passedEl = el;
+            var highlightedState = this.config.classNames.highlightedState;
+            this._removeHighlightedChoices();
             if (passedEl) {
                 this._highlightPosition = choices.indexOf(passedEl);
             }
@@ -4991,9 +5045,10 @@
             }
             this._store.dispatch(addItem(item));
             if (withEvents) {
-                this.passedElement.triggerEvent(EventType.addItem, this._getChoiceForOutput(item));
+                var eventChoice = getChoiceForOutput(item);
+                this.passedElement.triggerEvent(EventType.addItem, eventChoice);
                 if (userTriggered) {
-                    this.passedElement.triggerEvent(EventType.choice, this._getChoiceForOutput(item));
+                    this.passedElement.triggerEvent(EventType.choice, eventChoice);
                 }
             }
         };
@@ -5006,7 +5061,7 @@
             if (notice && notice.type === NoticeTypes.noChoices) {
                 this._clearNotice();
             }
-            this.passedElement.triggerEvent(EventType.removeItem, this._getChoiceForOutput(item));
+            this.passedElement.triggerEvent(EventType.removeItem, getChoiceForOutput(item));
         };
         Choices.prototype._addChoice = function (choice, withEvents, userTriggered) {
             if (withEvents === void 0) { withEvents = true; }
@@ -5121,25 +5176,25 @@
             containerInner.wrap(passedElement.element);
             // Wrapper inner container with outer container
             containerOuter.wrap(containerInner.element);
+            containerOuter.element.appendChild(containerInner.element);
+            containerOuter.element.appendChild(dropdownElement);
+            containerInner.element.appendChild(this.itemList.element);
+            dropdownElement.appendChild(this.choiceList.element);
             if (this._isSelectOneElement) {
                 this.input.placeholder = this.config.searchPlaceholderValue || '';
+                if (this.config.searchEnabled) {
+                    dropdownElement.insertBefore(this.input.element, dropdownElement.firstChild);
+                }
             }
             else {
+                if (!this._isSelectMultipleElement || this.config.searchEnabled) {
+                    containerInner.element.appendChild(this.input.element);
+                }
                 if (this._placeholderValue) {
                     this.input.placeholder = this._placeholderValue;
                 }
                 this.input.setWidth();
             }
-            containerOuter.element.appendChild(containerInner.element);
-            containerOuter.element.appendChild(dropdownElement);
-            containerInner.element.appendChild(this.itemList.element);
-            dropdownElement.appendChild(this.choiceList.element);
-            if (!this._isSelectOneElement) {
-                containerInner.element.appendChild(this.input.element);
-            }
-            else if (this.config.searchEnabled) {
-                dropdownElement.insertBefore(this.input.element, dropdownElement.firstChild);
-            }
             this._highlightPosition = 0;
             this._isSearching = false;
         };
@@ -5221,7 +5276,7 @@
                 throw new TypeError("".concat(caller, " called for an element which has multiple instances of Choices initialised on it"));
             }
         };
-        Choices.version = '11.1.0';
+        Choices.version = '11.2.1';
         return Choices;
     }());