@algolia/autocomplete-js 1.11.0 → 1.11.1

package/dist/esm/render.js

@@ -101,13 +101,12 @@ export function renderPanel(render, _ref2) {
     }, propGetters.getListProps(_objectSpread({
       state: state,
       props: autocomplete.getListProps({
-        sourceIndex: sourceIndex
+        source: source
       })
     }, autocompleteScopeApi))), items.map(function (item) {
       var itemProps = autocomplete.getItemProps({
         item: item,
-        source: source,
-        sourceIndex: sourceIndex
+        source: source
       });
       return renderer.createElement("li", _extends({
         key: itemProps.id,

package/dist/umd/index.development.js

@@ -1,4 +1,4 @@
-/*! @algolia/autocomplete-js 1.11.0 | MIT License | © Algolia, Inc. and contributors | https://github.com/algolia/autocomplete */
+/*! @algolia/autocomplete-js 1.11.1 | MIT License | © Algolia, Inc. and contributors | https://github.com/algolia/autocomplete */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
   typeof define === 'function' && define.amd ? define(['exports'], factory) :
@@ -347,7 +347,7 @@
     return undefined;
   }
 
-  var version = '1.11.0';
+  var version = '1.11.1';
 
   var userAgents$1 = [{
     segment: 'autocomplete-core',
@@ -1370,6 +1370,17 @@
     };
   }
 
+  /**
+   * Returns a full element id for an autocomplete element.
+   *
+   * @param autocompleteInstanceId The id of the autocomplete instance
+   * @param elementId The specific element id
+   * @param source The source of the element, when it needs to be scoped
+   */
+  function getAutocompleteElementId(autocompleteInstanceId, elementId, source) {
+    return [autocompleteInstanceId, source === null || source === void 0 ? void 0 : source.sourceId, elementId].filter(Boolean).join('-').replace(/\s/g, '');
+  }
+
   function isOrContainsNode(parent, child) {
     return parent === child || parent.contains(child);
   }
@@ -2358,7 +2369,8 @@
     if (event.key === 'ArrowUp' || event.key === 'ArrowDown') {
       // eslint-disable-next-line no-inner-declarations
       var triggerScrollIntoView = function triggerScrollIntoView() {
-        var nodeItem = props.environment.document.getElementById("".concat(props.id, "-item-").concat(store.getState().activeItemId));
+        var highlightedItem = getActiveItem(store.getState());
+        var nodeItem = props.environment.document.getElementById(getAutocompleteElementId(props.id, "item-".concat(store.getState().activeItemId), highlightedItem === null || highlightedItem === void 0 ? void 0 : highlightedItem.source));
         if (nodeItem) {
           if (nodeItem.scrollIntoViewIfNeeded) {
             nodeItem.scrollIntoViewIfNeeded(false);
@@ -2545,9 +2557,8 @@
     _excluded2 = ["inputElement", "formElement", "panelElement"],
     _excluded3 = ["inputElement"],
     _excluded4 = ["inputElement", "maxLength"],
-    _excluded5 = ["sourceIndex"],
-    _excluded6 = ["sourceIndex"],
-    _excluded7 = ["item", "source", "sourceIndex"];
+    _excluded5 = ["source"],
+    _excluded6 = ["item", "source"];
   function ownKeys$6(object, enumerableOnly) {
     var keys = Object.keys(object);
     if (Object.getOwnPropertySymbols) {
@@ -2692,8 +2703,11 @@
         role: 'combobox',
         'aria-expanded': store.getState().isOpen,
         'aria-haspopup': 'listbox',
-        'aria-owns': store.getState().isOpen ? "".concat(props.id, "-list") : undefined,
-        'aria-labelledby': "".concat(props.id, "-label")
+        'aria-owns': store.getState().isOpen ? store.getState().collections.map(function (_ref2) {
+          var source = _ref2.source;
+          return getAutocompleteElementId(props.id, 'list', source);
+        }).join(' ') : undefined,
+        'aria-labelledby': getAutocompleteElementId(props.id, 'label')
       }, rest);
     };
     var getFormProps = function getFormProps(providedProps) {
@@ -2743,22 +2757,25 @@
         }
         store.dispatch('focus', null);
       }
-      var _ref2 = providedProps || {};
-        _ref2.inputElement;
-        var _ref2$maxLength = _ref2.maxLength,
-        maxLength = _ref2$maxLength === void 0 ? 512 : _ref2$maxLength,
-        rest = _objectWithoutProperties$1(_ref2, _excluded4);
+      var _ref3 = providedProps || {};
+        _ref3.inputElement;
+        var _ref3$maxLength = _ref3.maxLength,
+        maxLength = _ref3$maxLength === void 0 ? 512 : _ref3$maxLength,
+        rest = _objectWithoutProperties$1(_ref3, _excluded4);
       var activeItem = getActiveItem(store.getState());
       var userAgent = ((_props$environment$na = props.environment.navigator) === null || _props$environment$na === void 0 ? void 0 : _props$environment$na.userAgent) || '';
       var shouldFallbackKeyHint = isSamsung(userAgent);
       var enterKeyHint = props.enterKeyHint || (activeItem !== null && activeItem !== void 0 && activeItem.itemUrl && !shouldFallbackKeyHint ? 'go' : 'search');
       return _objectSpread$6({
         'aria-autocomplete': 'both',
-        'aria-activedescendant': store.getState().isOpen && store.getState().activeItemId !== null ? "".concat(props.id, "-item-").concat(store.getState().activeItemId) : undefined,
-        'aria-controls': store.getState().isOpen ? "".concat(props.id, "-list") : undefined,
-        'aria-labelledby': "".concat(props.id, "-label"),
+        'aria-activedescendant': store.getState().isOpen && store.getState().activeItemId !== null ? getAutocompleteElementId(props.id, "item-".concat(store.getState().activeItemId), activeItem === null || activeItem === void 0 ? void 0 : activeItem.source) : undefined,
+        'aria-controls': store.getState().isOpen ? store.getState().collections.map(function (_ref4) {
+          var source = _ref4.source;
+          return getAutocompleteElementId(props.id, 'list', source);
+        }).join(' ') : undefined,
+        'aria-labelledby': getAutocompleteElementId(props.id, 'label'),
         value: store.getState().completion || store.getState().query,
-        id: "".concat(props.id, "-input"),
+        id: getAutocompleteElementId(props.id, 'input'),
         autoComplete: 'off',
         autoCorrect: 'off',
         autoCapitalize: 'off',
@@ -2804,26 +2821,20 @@
         }
       }, rest);
     };
-    var getAutocompleteId = function getAutocompleteId(instanceId, sourceId) {
-      return typeof sourceId !== 'undefined' ? "".concat(instanceId, "-").concat(sourceId) : instanceId;
-    };
-    var getLabelProps = function getLabelProps(providedProps) {
-      var _ref3 = providedProps || {},
-        sourceIndex = _ref3.sourceIndex,
-        rest = _objectWithoutProperties$1(_ref3, _excluded5);
+    var getLabelProps = function getLabelProps(rest) {
       return _objectSpread$6({
-        htmlFor: "".concat(getAutocompleteId(props.id, sourceIndex), "-input"),
-        id: "".concat(getAutocompleteId(props.id, sourceIndex), "-label")
+        htmlFor: getAutocompleteElementId(props.id, 'input'),
+        id: getAutocompleteElementId(props.id, 'label')
       }, rest);
     };
     var getListProps = function getListProps(providedProps) {
-      var _ref4 = providedProps || {},
-        sourceIndex = _ref4.sourceIndex,
-        rest = _objectWithoutProperties$1(_ref4, _excluded6);
+      var _ref5 = providedProps || {},
+        source = _ref5.source,
+        rest = _objectWithoutProperties$1(_ref5, _excluded5);
       return _objectSpread$6({
         role: 'listbox',
-        'aria-labelledby': "".concat(getAutocompleteId(props.id, sourceIndex), "-label"),
-        id: "".concat(getAutocompleteId(props.id, sourceIndex), "-list")
+        'aria-labelledby': getAutocompleteElementId(props.id, 'label'),
+        id: getAutocompleteElementId(props.id, 'list', source)
       }, rest);
     };
     var getPanelProps = function getPanelProps(rest) {
@@ -2842,10 +2853,9 @@
     var getItemProps = function getItemProps(providedProps) {
       var item = providedProps.item,
         source = providedProps.source,
-        sourceIndex = providedProps.sourceIndex,
-        rest = _objectWithoutProperties$1(providedProps, _excluded7);
+        rest = _objectWithoutProperties$1(providedProps, _excluded6);
       return _objectSpread$6({
-        id: "".concat(getAutocompleteId(props.id, sourceIndex), "-item-").concat(item.__autocomplete_id),
+        id: getAutocompleteElementId(props.id, "item-".concat(item.__autocomplete_id), source),
         role: 'option',
         'aria-selected': store.getState().activeItemId === item.__autocomplete_id,
         onMouseMove: function onMouseMove(event) {
@@ -4705,13 +4715,12 @@
       }, propGetters.getListProps(_objectSpread2({
         state: state,
         props: autocomplete.getListProps({
-          sourceIndex: sourceIndex
+          source: source
         })
       }, autocompleteScopeApi))), items.map(function (item) {
         var itemProps = autocomplete.getItemProps({
           item: item,
-          source: source,
-          sourceIndex: sourceIndex
+          source: source
         });
         return renderer.createElement("li", _extends({
           key: itemProps.id,