pull requests woocommerce#44 and woocommerce#45 are merged to our code base from upstream

Author: YuriWPY

src/js/select2/dropdown/search.js

@@ -18,6 +18,11 @@ define([
     this.$searchContainer = $search;
     this.$search = $search.find('input');
 
+    var label = this.options.get( 'label' );
+    if ( typeof( label ) === 'string' ) {
+      this.$search.attr( 'aria-label', label );
+    }
+
     $rendered.prepend($search);
 
     return $rendered;

src/js/select2/selection/base.js

@@ -15,7 +15,7 @@ define([
   BaseSelection.prototype.render = function () {
     var $selection = $(
       '<span class="select2-selection" ' +
-      ' aria-haspopup="true" aria-expanded="false">' +
+      ' role="combobox" aria-haspopup="listbox" aria-expanded="false">' +
       '</span>'
     );
 
@@ -60,10 +60,6 @@ define([
       }
     });
 
-    container.on('results:focus', function (params) {
-      self.$selection.attr('aria-activedescendant', params.data._resultId);
-    });
-
     container.on('selection:update', function (params) {
       self.update(params.data);
     });
@@ -79,7 +75,6 @@ define([
     container.on('close', function () {
       // When the dropdown is closed, aria-expanded="false"
       self.$selection.attr('aria-expanded', 'false');
-      self.$selection.removeAttr('aria-activedescendant');
       self.$selection.removeAttr('aria-owns');
 
       // This needs to be delayed as the active element is the body when the

src/js/select2/selection/search.js

@@ -12,13 +12,19 @@ define([
       '<li class="select2-search select2-search--inline">' +
         '<input class="select2-search__field" type="text" tabindex="-1"' +
         ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
-        ' spellcheck="false" role="textbox" aria-autocomplete="list" />' +
+        ' spellcheck="false" role="textbox" aria-autocomplete="list"' +
+        ' aria-multiline="false" />' +
       '</li>'
     );
 
     this.$searchContainer = $search;
     this.$search = $search.find('input');
 
+    var label = this.options.get( 'label' );
+    if ( typeof( label ) === 'string' ) {
+      this.$search.attr( 'aria-label', label );
+    }
+
     var $rendered = decorated.call(this);
 
     this._transferTabIndex();
@@ -33,14 +39,14 @@ define([
     decorated.call(this, container, $container);
 
     container.on('open', function () {
-      self.$search.attr('aria-owns', resultsId);
+      self.$search.attr('aria-controls', resultsId);
       self.$search.trigger('focus');
     });
 
     container.on('close', function () {
       self.$search.val('');
       self.$search.removeAttr('aria-activedescendant');
-      self.$search.removeAttr('aria-owns');
+      self.$search.removeAttr('aria-controls');
       self.$search.trigger('focus');
     });