govuk_publishing_components 21.37.0 → 21.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7343e4fe7a73cac6e8c139f06e54a8691a15cc4f6964595c4dac999d3186106
-  data.tar.gz: 1fee051d18738e77725e74464527b67eb9e7a99e2eceae382aee64e0acdcfb46
+  metadata.gz: 18137270f2852ffc825106a02021d82aec4bf5a484a3151cd9731044a1d74c2f
+  data.tar.gz: 3e69bbe1712825eebeaebd0a4856ba441f6ea3ee8f5378b8edaa3d2571e12432
 SHA512:
-  metadata.gz: 34e961e66d8957202a7e8c89755f7959b53793ae2181ecb4de104080a7f5e6f92f06002ed296c2c774f47f9a2555be68dfc50362dac4022181467aae4b844f3b
-  data.tar.gz: d04a0d287874c62a7b3a9b4399155944715a21c6c695412a6b42384b29667067f7479d7fba2e538c9f3f84ef493606b3a691fb084d9403e552cfb6935af192a3
+  metadata.gz: 3202d48ccec1cc270fed74433eeddf6b1137a3370f81ae61c39c0cd293ae29abca31006d89a298c304d433a3b1e472a0089a08a1ae511d3491b9ce74b21a7969
+  data.tar.gz: d1e5a814a0d052c755b00192cb6d2d987a87f988852f66aa9b0a0fc5f1ce898ea9055089e60b3800d021b92a7a0c9e6ddea7bfb64daf5e6c83b4741065e938ee

data/app/assets/javascripts/govuk_publishing_components/lib/govspeak/youtube-link-enhancement.js

@@ -20,11 +20,19 @@
 
     for (var i = 0; i < $youtubeLinks.length; ++i) {
       var $link = $youtubeLinks[i]
+      var href = $link.getAttribute('href')
 
-      var videoId = YoutubeLinkEnhancement.parseVideoId($link.getAttribute('href'))
+      if (href.includes("/live_stream")) {
+        var channelId = YoutubeLinkEnhancement.parseLivestream(href)
 
-      if (!this.hasDisabledEmbed($link) && videoId) {
-        this.setupVideo($link, videoId)
+        if (!this.hasDisabledEmbed($link) && channelId) {
+          this.setupVideo({link: $link, channel: channelId})
+        }
+      } else {
+        var videoId = YoutubeLinkEnhancement.parseVideoId(href)
+        if (!this.hasDisabledEmbed($link) && videoId) {
+          this.setupVideo({link: $link, videoId: videoId})
+        }
       }
     }
   }
@@ -33,21 +41,36 @@
     return $link.getAttribute('data-youtube-player') === 'off'
   }
 
-  YoutubeLinkEnhancement.prototype.setupVideo = function ($link, videoId) {
+  YoutubeLinkEnhancement.prototype.setupVideo = function (options) {
     var elementId = YoutubeLinkEnhancement.nextId()
+    var $link = options.link
+
+    var id = options.videoId ? options.videoId : options.channel
 
     var parentPara = $link.parentNode
     var parentContainer = parentPara.parentNode
 
     var youtubeVideoContainer = document.createElement('div')
     youtubeVideoContainer.className += 'gem-c-govspeak__youtube-video'
-    youtubeVideoContainer.innerHTML = '<span id="' + elementId + '" data-video-id="' + videoId + '"></span>'
+    youtubeVideoContainer.innerHTML = '<span id="' + elementId + '" data-video-id="' + id + '"></span>'
+
+    options['title'] = $link.textContent
 
     parentContainer.replaceChild(youtubeVideoContainer, parentPara)
-    this.insertVideo(elementId, videoId, $link.textContent)
+    this.insertVideo(elementId, options)
   }
 
-  YoutubeLinkEnhancement.prototype.insertVideo = function (elementId, videoId, title) {
+  YoutubeLinkEnhancement.prototype.insertVideo = function (elementId, options) {
+    var channelId = ""
+    var videoId = ""
+
+    if (options.channel) {
+      channelId = options.channel
+      videoId = "live_stream"
+    } else {
+      videoId = options.videoId
+    }
+
     var videoInsert = function () {
       new window.YT.Player(elementId, { // eslint-disable-line no-new
         videoId: videoId,
@@ -62,12 +85,15 @@
           // https://www.w3.org/WAI/WCAG21/quickref/#character-key-shortcuts
           disablekb: 1,
           // prevent the YouTube logo from displaying in the control bar
-          modestbranding: 1
+          modestbranding: 1,
+          // To support live_stream videos
+          channel: channelId
         },
         events: {
           onReady: function (event) {
             // update iframe title attribute once video is ready
-            event.target.a.setAttribute('title', title + ' (video)')
+            var videoTitle = options.title
+            event.target.f.title = videoTitle + ' (video)'
           }
         }
       })
@@ -105,6 +131,14 @@
     this.apiScriptInserted = true
   }
 
+  YoutubeLinkEnhancement.parseLivestream = function (url) {
+    var matches = url.match(/channel=([^&]*)/)
+
+    if (matches) {
+      return matches[1]
+    }
+  }
+
   // This is a public class method so it can be used outside of this embed to
   // check that user input for videos will be supported in govspeak
   YoutubeLinkEnhancement.parseVideoId = function (url) {
@@ -123,8 +157,7 @@
       }
       return params.v
     }
-
-    if (url.indexOf('youtu.be') > -1) {
+    else if (url.indexOf('youtu.be') > -1) {
       parts = url.split('/')
       return parts.pop()
     }

data/app/views/govuk_publishing_components/components/docs/govspeak.yml

@@ -285,6 +285,11 @@ examples:
       block: |
         <p>This content has a YouTube video link, converted to an accessible embedded player by component JavaScript.</p>
         <p><a href="https://www.youtube.com/watch?v=y6hbrS3DheU">Operations: a developer's guide, by Anna Shipman</a></p>
+  with_youtube_livestream:
+    data:
+      block: |
+        <p>This content has a YouTube livestream link, converted to an accessible embedded player by component JavaScript.</p>
+        <p><a href="https://www.youtube.com/embed/live_stream?channel=UCoMdktPbSTixAyNGwb-UYkQ">Livestream video</a></p>
   with_youtube_embed_disabled:
     data:
       disable_youtube_expansions: true

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "21.37.0".freeze
+  VERSION = "21.38.0".freeze
 end

data/node_modules/axe-core/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.5.3](https://github.com/dequelabs/axe-core/compare/v3.5.2...v3.5.3) (2020-03-31)
+
+### Bug Fixes
+
+- **meta-viewport:** parse negative and string values for `maximum-scale` ([#2137](https://github.com/dequelabs/axe-core/issues/2137)) ([8c92472](https://github.com/dequelabs/axe-core/commit/8c92472397676d44b333cf50ad1a9413b9783c2c))
+- **respondable:** ignore reflected messages from iframes ([#2134](https://github.com/dequelabs/axe-core/issues/2134)) ([3ab9f21](https://github.com/dequelabs/axe-core/commit/3ab9f21414d8f4195ac95ffca8f0ce52258539b0))
+- **header-present:** update verbiage to use heading instead of header ([#2132](https://github.com/dequelabs/axe-core/issues/2132)) ([8890063](https://github.com/dequelabs/axe-core/commit/889006397329a35a170f4a3d24c55c3c4fd758fc))
+- **color-contrast:** mark more punctuations for review ([#2126](https://github.com/dequelabs/axe-core/issues/2126)) ([dc98afc](https://github.com/dequelabs/axe-core/commit/dc98afc841c86e4b7b771bbb1171152a151c3e5b))
+- **unicode:** detect supplementary private use area A ([#2102](https://github.com/dequelabs/axe-core/issues/2102)) ([f1739c2](https://github.com/dequelabs/axe-core/commit/f1739c21efdf5cf6fddf425d1c72b056757f3ba1))
+- **definition-list:** Mention <div> is allowed to group content in <dl> ([#2098](https://github.com/dequelabs/axe-core/issues/2098)) ([76b1a9f](https://github.com/dequelabs/axe-core/commit/76b1a9f7f244e43f63351c46d91fc8b27040ba98))
+- **td-headers-attr:** mark as needs review if headers attr is empty ([#2096](https://github.com/dequelabs/axe-core/issues/2096)) ([699b566](https://github.com/dequelabs/axe-core/commit/699b566111cfed2a4ebeade35346a49bcb3546c7))
+- **td-has-headers:** don't fail for empty headers attribute ([#2095](https://github.com/dequelabs/axe-core/issues/2095)) ([7952a37](https://github.com/dequelabs/axe-core/commit/7952a377b960c2403c8d4758a9f35ebe525549fe))
+- **th-has-data-cells:** fail when data cell points to a different header ([#2094](https://github.com/dequelabs/axe-core/issues/2094)) ([d3bd416](https://github.com/dequelabs/axe-core/commit/d3bd416a3df7324231f17ff9e1e20dc6342c7aa5))
+- **has-lang:** update message to indicate that xml:lang is not valid on HTML pages ([#2093](https://github.com/dequelabs/axe-core/issues/2093)) ([c3a7de2](https://github.com/dequelabs/axe-core/commit/c3a7de206baf77c0b25c8c095119393b1dc85f0f))
+- **page-no-duplicate-contentinfo:** do not fail when first element is inside landmark ([#2092](https://github.com/dequelabs/axe-core/issues/2092)) ([eca7e05](https://github.com/dequelabs/axe-core/commit/eca7e05cc6ff750855bcb219833967a9d7087679))
+
 ### [3.5.2](https://github.com/dequelabs/axe-core/compare/v3.5.1...v3.5.2) (2020-03-06)
 
 ### Bug Fixes

data/node_modules/axe-core/README.md

@@ -50,15 +50,16 @@ Now include the javascript file in each of your iframes in your fixtures or test
 Now insert calls at each point in your tests where a new piece of UI becomes visible or exposed:
 
 ```js
-axe.run()
-  .then(results => {
-    if (results.violations.length) {
-      throw new Error('Accessibility issues found')
-    }
-  })
-  .catch(err => {
-    console.error('Something bad happened:', err.message)
-  })
+axe
+	.run()
+	.then(results => {
+		if (results.violations.length) {
+			throw new Error('Accessibility issues found');
+		}
+	})
+	.catch(err => {
+		console.error('Something bad happened:', err.message);
+	});
 ```
 
 ## Supported Browsers

data/node_modules/axe-core/axe.js

@@ -1,4 +1,4 @@
-/*! axe v3.5.2
+/*! axe v3.5.3
  * Copyright (c) 2020 Deque Systems, Inc.
  *
  * Your use of this Source Code Form is subject to the terms of the Mozilla Public
@@ -27,7 +27,7 @@
     return _typeof(obj);
   }
   var axe = axe || {};
-  axe.version = '3.5.2';
+  axe.version = '3.5.3';
   if (typeof define === 'function' && define.amd) {
     define('axe-core', [], function() {
       'use strict';
@@ -13173,6 +13173,7 @@
         error: error,
         _respondable: true,
         _source: _getSource(),
+        _axeuuid: axe._uuid,
         _keepalive: keepalive
       };
       var axeRespondables = axe._cache.get('axeRespondables');
@@ -13240,12 +13241,12 @@
     if (typeof window.addEventListener === 'function') {
       window.addEventListener('message', function(e) {
         var data = parseMessage(e.data);
-        if (!data) {
+        if (!data || !data._axeuuid) {
           return;
         }
         var uuid = data.uuid;
         var axeRespondables = axe._cache.get('axeRespondables') || {};
-        if (axeRespondables[uuid] && data.topic && e.source !== window) {
+        if (axeRespondables[uuid] && data._axeuuid === axe._uuid) {
           return;
         }
         var keepalive = data._keepalive;
@@ -13561,6 +13562,7 @@
     uuid.parse = parse;
     uuid.unparse = unparse;
     uuid.BufferClass = BufferClass;
+    axe._uuid = v1();
   })(window);
   'use strict';
   axe.utils.validInputTypes = function validInputTypes() {
@@ -13768,7 +13770,7 @@
         },
         'definition-list': {
           description: 'Ensures <dl> elements are structured correctly',
-          help: '<dl> elements must only directly contain properly-ordered <dt> and <dd> groups, <script> or <template> elements'
+          help: '<dl> elements must only directly contain properly-ordered <dt> and <dd> groups, <script>, <template> or <div> elements'
         },
         dlitem: {
           description: 'Ensures <dt> and <dd> elements are contained by a <dl>',
@@ -14318,8 +14320,8 @@
         'header-present': {
           impact: 'serious',
           messages: {
-            pass: 'Page has a header',
-            fail: 'Page does not have a header'
+            pass: 'Page has a heading',
+            fail: 'Page does not have a heading'
           }
         },
         landmark: {
@@ -14487,7 +14489,10 @@
           impact: 'serious',
           messages: {
             pass: 'The <html> element has a lang attribute',
-            fail: 'The <html> element does not have a lang attribute'
+            fail: {
+              noXHTML: 'The xml:lang attribute is not valid on HTML pages, use the lang attribute.',
+              noLang: 'The <html> element does not have a lang attribute'
+            }
           }
         },
         'valid-lang': {
@@ -14828,6 +14833,7 @@
           impact: 'serious',
           messages: {
             pass: 'The headers attribute is exclusively used to refer to other cells in the table',
+            incomplete: 'The headers attribute is empty',
             fail: 'The headers attribute is not exclusively used to refer to other cells in the table'
           }
         },
@@ -15657,7 +15663,7 @@
         var type = node.getAttribute('type').toLowerCase();
         return [ 'hidden', 'image', 'button', 'submit', 'reset' ].includes(type) === false;
       },
-      tags: [ 'cat.forms', 'wcag2a', 'wcag332', 'wcag131', 'section508', 'section508.22.n' ],
+      tags: [ 'cat.forms', 'wcag2a', 'wcag412', 'wcag131', 'section508', 'section508.22.n' ],
       all: [],
       any: [ 'aria-label', 'aria-labelledby', 'implicit-label', 'explicit-label', 'non-empty-title' ],
       none: [ 'help-same-as-label', 'hidden-explicit-label' ]
@@ -17213,17 +17219,19 @@
         }
         axe._cache.set(key, true);
         var elms = axe.utils.querySelectorAllFilter(axe._tree[0], options.selector, function(elm) {
-          return elm !== virtualNode && axe.commons.dom.isVisible(elm.actualNode);
+          return axe.commons.dom.isVisible(elm.actualNode);
         });
         if (typeof options.nativeScopeFilter === 'string') {
           elms = elms.filter(function(elm) {
             return elm.actualNode.hasAttribute('role') || !axe.commons.dom.findUpVirtual(elm, options.nativeScopeFilter);
           });
         }
-        this.relatedNodes(elms.map(function(elm) {
+        this.relatedNodes(elms.filter(function(elm) {
+          return elm !== virtualNode;
+        }).map(function(elm) {
           return elm.actualNode;
         }));
-        return elms.length === 0;
+        return elms.length <= 1;
       },
       after: function after(results, options) {
         return results.filter(function(checkResult) {
@@ -17247,17 +17255,19 @@
         }
         axe._cache.set(key, true);
         var elms = axe.utils.querySelectorAllFilter(axe._tree[0], options.selector, function(elm) {
-          return elm !== virtualNode && axe.commons.dom.isVisible(elm.actualNode);
+          return axe.commons.dom.isVisible(elm.actualNode);
         });
         if (typeof options.nativeScopeFilter === 'string') {
           elms = elms.filter(function(elm) {
             return elm.actualNode.hasAttribute('role') || !axe.commons.dom.findUpVirtual(elm, options.nativeScopeFilter);
           });
         }
-        this.relatedNodes(elms.map(function(elm) {
+        this.relatedNodes(elms.filter(function(elm) {
+          return elm !== virtualNode;
+        }).map(function(elm) {
           return elm.actualNode;
         }));
-        return elms.length === 0;
+        return elms.length <= 1;
       },
       after: function after(results, options) {
         return results.filter(function(checkResult) {
@@ -17281,17 +17291,19 @@
         }
         axe._cache.set(key, true);
         var elms = axe.utils.querySelectorAllFilter(axe._tree[0], options.selector, function(elm) {
-          return elm !== virtualNode && axe.commons.dom.isVisible(elm.actualNode);
+          return axe.commons.dom.isVisible(elm.actualNode);
         });
         if (typeof options.nativeScopeFilter === 'string') {
           elms = elms.filter(function(elm) {
             return elm.actualNode.hasAttribute('role') || !axe.commons.dom.findUpVirtual(elm, options.nativeScopeFilter);
           });
         }
-        this.relatedNodes(elms.map(function(elm) {
+        this.relatedNodes(elms.filter(function(elm) {
+          return elm !== virtualNode;
+        }).map(function(elm) {
           return elm.actualNode;
         }));
-        return elms.length === 0;
+        return elms.length <= 1;
       },
       after: function after(results, options) {
         return results.filter(function(checkResult) {
@@ -17516,10 +17528,19 @@
         var isXHTML = axe.utils.isXHTML;
         var langValue = (node.getAttribute('lang') || '').trim();
         var xmlLangValue = (node.getAttribute('xml:lang') || '').trim();
-        if (!langValue && !isXHTML(document)) {
+        if (!langValue && xmlLangValue && !isXHTML(document)) {
+          this.data({
+            messageKey: 'noXHTML'
+          });
+          return false;
+        }
+        if (!(langValue || xmlLangValue)) {
+          this.data({
+            messageKey: 'noLang'
+          });
           return false;
         }
-        return !!(langValue || xmlLangValue);
+        return true;
       }
     }, {
       id: 'valid-lang',
@@ -17974,15 +17995,28 @@
     }, {
       id: 'meta-viewport-large',
       evaluate: function evaluate(node, options, virtualNode, context) {
-        options = options || {};
-        var params, content = node.getAttribute('content') || '', parsedParams = content.split(/[;,]/), result = {}, minimum = options.scaleMinimum || 2, lowerBound = options.lowerBound || false;
-        for (var i = 0, l = parsedParams.length; i < l; i++) {
-          params = parsedParams[i].split('=');
-          var key = params.shift().toLowerCase();
-          if (key && params.length) {
-            result[key.trim()] = params.shift().trim().toLowerCase();
-          }
+        var _ref17 = options || {}, _ref17$scaleMinimum = _ref17.scaleMinimum, scaleMinimum = _ref17$scaleMinimum === void 0 ? 2 : _ref17$scaleMinimum, _ref17$lowerBound = _ref17.lowerBound, lowerBound = _ref17$lowerBound === void 0 ? false : _ref17$lowerBound;
+        var content = node.getAttribute('content') || '';
+        if (!content) {
+          return true;
         }
+        var result = content.split(/[;,]/).reduce(function(out, item) {
+          var contentValue = item.trim();
+          if (!contentValue) {
+            return out;
+          }
+          var _contentValue$split = contentValue.split('='), _contentValue$split2 = _slicedToArray(_contentValue$split, 2), key = _contentValue$split2[0], value = _contentValue$split2[1];
+          var curatedKey = key.toLowerCase().trim();
+          var curatedValue = value.toLowerCase().trim();
+          if (curatedKey === 'maximum-scale' && curatedValue === 'yes') {
+            curatedValue = 1;
+          }
+          if (curatedKey === 'maximum-scale' && parseFloat(curatedValue) < 0) {
+            return out;
+          }
+          out[curatedKey] = curatedValue;
+          return out;
+        }, {});
         if (lowerBound && result['maximum-scale'] && parseFloat(result['maximum-scale']) < lowerBound) {
           return true;
         }
@@ -17990,7 +18024,7 @@
           this.data('user-scalable=no');
           return false;
         }
-        if (result['maximum-scale'] && parseFloat(result['maximum-scale']) < minimum) {
+        if (result['maximum-scale'] && parseFloat(result['maximum-scale']) < scaleMinimum) {
           this.data('maximum-scale');
           return false;
         }
@@ -18003,15 +18037,28 @@
     }, {
       id: 'meta-viewport',
       evaluate: function evaluate(node, options, virtualNode, context) {
-        options = options || {};
-        var params, content = node.getAttribute('content') || '', parsedParams = content.split(/[;,]/), result = {}, minimum = options.scaleMinimum || 2, lowerBound = options.lowerBound || false;
-        for (var i = 0, l = parsedParams.length; i < l; i++) {
-          params = parsedParams[i].split('=');
-          var key = params.shift().toLowerCase();
-          if (key && params.length) {
-            result[key.trim()] = params.shift().trim().toLowerCase();
-          }
+        var _ref18 = options || {}, _ref18$scaleMinimum = _ref18.scaleMinimum, scaleMinimum = _ref18$scaleMinimum === void 0 ? 2 : _ref18$scaleMinimum, _ref18$lowerBound = _ref18.lowerBound, lowerBound = _ref18$lowerBound === void 0 ? false : _ref18$lowerBound;
+        var content = node.getAttribute('content') || '';
+        if (!content) {
+          return true;
         }
+        var result = content.split(/[;,]/).reduce(function(out, item) {
+          var contentValue = item.trim();
+          if (!contentValue) {
+            return out;
+          }
+          var _contentValue$split3 = contentValue.split('='), _contentValue$split4 = _slicedToArray(_contentValue$split3, 2), key = _contentValue$split4[0], value = _contentValue$split4[1];
+          var curatedKey = key.toLowerCase().trim();
+          var curatedValue = value.toLowerCase().trim();
+          if (curatedKey === 'maximum-scale' && curatedValue === 'yes') {
+            curatedValue = 1;
+          }
+          if (curatedKey === 'maximum-scale' && parseFloat(curatedValue) < 0) {
+            return out;
+          }
+          out[curatedKey] = curatedValue;
+          return out;
+        }, {});
         if (lowerBound && result['maximum-scale'] && parseFloat(result['maximum-scale']) < lowerBound) {
           return true;
         }
@@ -18019,7 +18066,7 @@
           this.data('user-scalable=no');
           return false;
         }
-        if (result['maximum-scale'] && parseFloat(result['maximum-scale']) < minimum) {
+        if (result['maximum-scale'] && parseFloat(result['maximum-scale']) < scaleMinimum) {
           this.data('maximum-scale');
           return false;
         }
@@ -18086,8 +18133,8 @@
         if (results.length < 2) {
           return results;
         }
-        var incompleteResults = results.filter(function(_ref17) {
-          var result = _ref17.result;
+        var incompleteResults = results.filter(function(_ref19) {
+          var result = _ref19.result;
           return result !== undefined;
         });
         var uniqueResults = [];
@@ -18099,12 +18146,12 @@
           if (nameMap[name]) {
             return 'continue';
           }
-          var sameNameResults = incompleteResults.filter(function(_ref18, resultNum) {
-            var data = _ref18.data;
+          var sameNameResults = incompleteResults.filter(function(_ref20, resultNum) {
+            var data = _ref20.data;
             return data.name === name && resultNum !== index;
           });
-          var isSameUrl = sameNameResults.every(function(_ref19) {
-            var data = _ref19.data;
+          var isSameUrl = sameNameResults.every(function(_ref21) {
+            var data = _ref21.data;
             return isIdenticalObject(data.urlProps, urlProps);
           });
           if (sameNameResults.length && !isSameUrl) {
@@ -18305,8 +18352,8 @@
           } else if (node !== document.body && dom.hasContent(node, true)) {
             return [ virtualNode ];
           } else {
-            return virtualNode.children.filter(function(_ref20) {
-              var actualNode = _ref20.actualNode;
+            return virtualNode.children.filter(function(_ref22) {
+              var actualNode = _ref22.actualNode;
               return actualNode.nodeType === 1;
             }).map(findRegionlessElms).reduce(function(a, b) {
               return a.concat(b);
@@ -18549,8 +18596,8 @@
     }, {
       id: 'svg-non-empty-title',
       evaluate: function evaluate(node, options, virtualNode, context) {
-        var titleNode = virtualNode.children.find(function(_ref21) {
-          var props = _ref21.props;
+        var titleNode = virtualNode.children.find(function(_ref23) {
+          var props = _ref23.props;
           return props.nodeName === 'title';
         });
         return !!titleNode && titleNode.actualNode.textContent.trim() !== '';
@@ -18647,9 +18694,11 @@
       id: 'td-headers-attr',
       evaluate: function evaluate(node, options, virtualNode, context) {
         var cells = [];
-        for (var rowIndex = 0, rowLength = node.rows.length; rowIndex < rowLength; rowIndex++) {
+        var reviewCells = [];
+        var badCells = [];
+        for (var rowIndex = 0; rowIndex < node.rows.length; rowIndex++) {
           var row = node.rows[rowIndex];
-          for (var cellIndex = 0, cellLength = row.cells.length; cellIndex < cellLength; cellIndex++) {
+          for (var cellIndex = 0; cellIndex < row.cells.length; cellIndex++) {
             cells.push(row.cells[cellIndex]);
           }
         }
@@ -18659,34 +18708,38 @@
           }
           return ids;
         }, []);
-        var badCells = cells.reduce(function(badCells, cell) {
-          var isSelf, notOfTable;
-          var headers = (cell.getAttribute('headers') || '').split(/\s/).reduce(function(headers, header) {
-            header = header.trim();
-            if (header) {
-              headers.push(header);
-            }
-            return headers;
-          }, []);
+        cells.forEach(function(cell) {
+          var isSelf = false;
+          var notOfTable = false;
+          if (!cell.hasAttribute('headers')) {
+            return;
+          }
+          var headersAttr = cell.getAttribute('headers').trim();
+          if (!headersAttr) {
+            return reviewCells.push(cell);
+          }
+          var headers = axe.utils.tokenList(headersAttr);
           if (headers.length !== 0) {
             if (cell.getAttribute('id')) {
               isSelf = headers.indexOf(cell.getAttribute('id').trim()) !== -1;
             }
-            notOfTable = headers.reduce(function(fail, header) {
-              return fail || ids.indexOf(header) === -1;
-            }, false);
+            notOfTable = headers.some(function(header) {
+              return !ids.includes(header);
+            });
             if (isSelf || notOfTable) {
               badCells.push(cell);
             }
           }
-          return badCells;
-        }, []);
+        });
         if (badCells.length > 0) {
           this.relatedNodes(badCells);
           return false;
-        } else {
-          return true;
         }
+        if (reviewCells.length) {
+          this.relatedNodes(reviewCells);
+          return undefined;
+        }
+        return true;
       }
     }, {
       id: 'th-has-data-cells',
@@ -18721,12 +18774,12 @@
           var hasCell = false;
           if (tableUtils.isColumnHeader(header)) {
             hasCell = tableUtils.traverse('down', pos, tableGrid).find(function(cell) {
-              return !tableUtils.isColumnHeader(cell);
+              return !tableUtils.isColumnHeader(cell) && tableUtils.getHeaders(cell, tableGrid).includes(header);
             });
           }
           if (!hasCell && tableUtils.isRowHeader(header)) {
             hasCell = tableUtils.traverse('right', pos, tableGrid).find(function(cell) {
-              return !tableUtils.isRowHeader(cell);
+              return !tableUtils.isRowHeader(cell) && tableUtils.getHeaders(cell, tableGrid).includes(header);
             });
           }
           if (!hasCell) {
@@ -20497,8 +20550,8 @@
         nodeName: [ 'abbr', 'address', 'canvas', 'div', 'p', 'pre', 'blockquote', 'ins', 'del', 'output', 'span', 'table', 'tbody', 'thead', 'tfoot', 'td', 'em', 'strong', 'small', 's', 'cite', 'q', 'dfn', 'abbr', 'time', 'code', 'var', 'samp', 'kbd', 'sub', 'sup', 'i', 'b', 'u', 'mark', 'ruby', 'rt', 'rp', 'bdi', 'bdo', 'br', 'wbr', 'th', 'tr' ]
       } ];
       lookupTable.evaluateRoleForElement = {
-        A: function A(_ref22) {
-          var node = _ref22.node, out = _ref22.out;
+        A: function A(_ref24) {
+          var node = _ref24.node, out = _ref24.out;
           if (node.namespaceURI === 'http://www.w3.org/2000/svg') {
             return true;
           }
@@ -20507,19 +20560,19 @@
           }
           return true;
         },
-        AREA: function AREA(_ref23) {
-          var node = _ref23.node;
+        AREA: function AREA(_ref25) {
+          var node = _ref25.node;
           return !node.href;
         },
-        BUTTON: function BUTTON(_ref24) {
-          var node = _ref24.node, role = _ref24.role, out = _ref24.out;
+        BUTTON: function BUTTON(_ref26) {
+          var node = _ref26.node, role = _ref26.role, out = _ref26.out;
           if (node.getAttribute('type') === 'menu') {
             return role === 'menuitem';
           }
           return out;
         },
-        IMG: function IMG(_ref25) {
-          var node = _ref25.node, role = _ref25.role, out = _ref25.out;
+        IMG: function IMG(_ref27) {
+          var node = _ref27.node, role = _ref27.role, out = _ref27.out;
           switch (node.alt) {
            case null:
             return out;
@@ -20531,8 +20584,8 @@
             return role !== 'presentation' && role !== 'none';
           }
         },
-        INPUT: function INPUT(_ref26) {
-          var node = _ref26.node, role = _ref26.role, out = _ref26.out;
+        INPUT: function INPUT(_ref28) {
+          var node = _ref28.node, role = _ref28.role, out = _ref28.out;
           switch (node.type) {
            case 'button':
            case 'image':
@@ -20562,32 +20615,32 @@
             return false;
           }
         },
-        LI: function LI(_ref27) {
-          var node = _ref27.node, out = _ref27.out;
+        LI: function LI(_ref29) {
+          var node = _ref29.node, out = _ref29.out;
           var hasImplicitListitemRole = axe.utils.matchesSelector(node, 'ol li, ul li');
           if (hasImplicitListitemRole) {
             return out;
           }
           return true;
         },
-        MENU: function MENU(_ref28) {
-          var node = _ref28.node;
+        MENU: function MENU(_ref30) {
+          var node = _ref30.node;
           if (node.getAttribute('type') === 'context') {
             return false;
           }
           return true;
         },
-        OPTION: function OPTION(_ref29) {
-          var node = _ref29.node;
+        OPTION: function OPTION(_ref31) {
+          var node = _ref31.node;
           var withinOptionList = axe.utils.matchesSelector(node, 'select > option, datalist > option, optgroup > option');
           return !withinOptionList;
         },
-        SELECT: function SELECT(_ref30) {
-          var node = _ref30.node, role = _ref30.role;
+        SELECT: function SELECT(_ref32) {
+          var node = _ref32.node, role = _ref32.role;
           return !node.multiple && node.size <= 1 && role === 'menu';
         },
-        SVG: function SVG(_ref31) {
-          var node = _ref31.node, out = _ref31.out;
+        SVG: function SVG(_ref33) {
+          var node = _ref33.node, out = _ref33.out;
           if (node.parentNode && node.parentNode.namespaceURI === 'http://www.w3.org/2000/svg') {
             return true;
           }
@@ -20699,8 +20752,8 @@
         });
         return unallowedRoles;
       };
-      aria.getOwnedVirtual = function getOwned(_ref32) {
-        var actualNode = _ref32.actualNode, children = _ref32.children;
+      aria.getOwnedVirtual = function getOwned(_ref34) {
+        var actualNode = _ref34.actualNode, children = _ref34.children;
         if (!actualNode || !children) {
           throw new Error('getOwnedVirtual requires a virtual node');
         }
@@ -20713,7 +20766,7 @@
         }, children);
       };
       aria.getRole = function getRole(node) {
-        var _ref33 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, noImplicit = _ref33.noImplicit, fallback = _ref33.fallback, abstracts = _ref33.abstracts, dpub = _ref33.dpub;
+        var _ref35 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, noImplicit = _ref35.noImplicit, fallback = _ref35.fallback, abstracts = _ref35.abstracts, dpub = _ref35.dpub;
         node = node.actualNode || node;
         if (node.nodeType !== 1) {
           return null;
@@ -20799,8 +20852,8 @@
         var roleDefinition = aria.lookupTable.role[role];
         return roleDefinition ? roleDefinition.unsupported : false;
       };
-      aria.labelVirtual = function(_ref34) {
-        var actualNode = _ref34.actualNode;
+      aria.labelVirtual = function(_ref36) {
+        var actualNode = _ref36.actualNode;
         var ref, candidate;
         if (actualNode.getAttribute('aria-labelledby')) {
           ref = dom.idrefs(actualNode, 'aria-labelledby');
@@ -20826,7 +20879,7 @@
         return aria.labelVirtual(node);
       };
       aria.namedFromContents = function namedFromContents(node) {
-        var _ref35 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, strict = _ref35.strict;
+        var _ref37 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, strict = _ref37.strict;
         node = node.actualNode || node;
         if (node.nodeType !== 1) {
           return false;
@@ -20842,7 +20895,7 @@
         return !roleDef || [ 'presentation', 'none' ].includes(role);
       };
       aria.isValidRole = function(role) {
-        var _ref36 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, allowAbstract = _ref36.allowAbstract, _ref36$flagUnsupporte = _ref36.flagUnsupported, flagUnsupported = _ref36$flagUnsupporte === void 0 ? false : _ref36$flagUnsupporte;
+        var _ref38 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, allowAbstract = _ref38.allowAbstract, _ref38$flagUnsupporte = _ref38.flagUnsupported, flagUnsupported = _ref38$flagUnsupporte === void 0 ? false : _ref38$flagUnsupporte;
         var roleDefinition = aria.lookupTable.role[role];
         var isRoleUnsupported = roleDefinition ? roleDefinition.unsupported : false;
         if (!roleDefinition || flagUnsupported && isRoleUnsupported) {
@@ -21330,8 +21383,8 @@
         }
         return finalElements;
       };
-      dom.findElmsInContext = function(_ref37) {
-        var context = _ref37.context, value = _ref37.value, attr = _ref37.attr, _ref37$elm = _ref37.elm, elm = _ref37$elm === void 0 ? '' : _ref37$elm;
+      dom.findElmsInContext = function(_ref39) {
+        var context = _ref39.context, value = _ref39.value, attr = _ref39.attr, _ref39$elm = _ref39.elm, elm = _ref39$elm === void 0 ? '' : _ref39$elm;
         var root;
         var escapedValue = axe.utils.escapeSelector(value);
         if (context.nodeType === 9 || context.nodeType === 11) {
@@ -21761,8 +21814,8 @@
       var hiddenTextElms = [ 'HEAD', 'TITLE', 'TEMPLATE', 'SCRIPT', 'STYLE', 'IFRAME', 'OBJECT', 'VIDEO', 'AUDIO', 'NOSCRIPT' ];
       function hasChildTextNodes(elm) {
         if (!hiddenTextElms.includes(elm.actualNode.nodeName.toUpperCase())) {
-          return elm.children.some(function(_ref38) {
-            var actualNode = _ref38.actualNode;
+          return elm.children.some(function(_ref40) {
+            var actualNode = _ref40.actualNode;
             return actualNode.nodeType === 3 && actualNode.nodeValue.trim();
           });
         }
@@ -22101,8 +22154,8 @@
         if (!refs || !refs.length) {
           return false;
         }
-        return refs.some(function(_ref39) {
-          var actualNode = _ref39.actualNode;
+        return refs.some(function(_ref41) {
+          var actualNode = _ref41.actualNode;
           return dom.isVisible(actualNode, screenReader, recursed);
         });
       }
@@ -22491,8 +22544,13 @@
         return headers;
       }
       table.getHeaders = function(cell, tableGrid) {
-        if (cell.hasAttribute('headers')) {
-          return commons.dom.idrefs(cell, 'headers');
+        if (cell.getAttribute('headers')) {
+          var headers = commons.dom.idrefs(cell, 'headers');
+          if (headers.filter(function(header) {
+            return header;
+          }).length) {
+            return headers;
+          }
         }
         if (!tableGrid) {
           tableGrid = commons.table.toGrid(commons.dom.findUp(cell, 'table'));
@@ -22775,15 +22833,15 @@
         }
         return accName;
       };
-      function textNodeContent(_ref40) {
-        var actualNode = _ref40.actualNode;
+      function textNodeContent(_ref42) {
+        var actualNode = _ref42.actualNode;
         if (actualNode.nodeType !== 3) {
           return '';
         }
         return actualNode.textContent;
       }
-      function shouldIgnoreHidden(_ref41, context) {
-        var actualNode = _ref41.actualNode;
+      function shouldIgnoreHidden(_ref43, context) {
+        var actualNode = _ref43.actualNode;
         if (actualNode.nodeType !== 1 || context.includeHidden) {
           return false;
         }
@@ -23011,7 +23069,7 @@
       };
       text.autocomplete = autocomplete;
       text.isValidAutocomplete = function isValidAutocomplete(autocomplete) {
-        var _ref42 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, _ref42$looseTyped = _ref42.looseTyped, looseTyped = _ref42$looseTyped === void 0 ? false : _ref42$looseTyped, _ref42$stateTerms = _ref42.stateTerms, stateTerms = _ref42$stateTerms === void 0 ? [] : _ref42$stateTerms, _ref42$locations = _ref42.locations, locations = _ref42$locations === void 0 ? [] : _ref42$locations, _ref42$qualifiers = _ref42.qualifiers, qualifiers = _ref42$qualifiers === void 0 ? [] : _ref42$qualifiers, _ref42$standaloneTerm = _ref42.standaloneTerms, standaloneTerms = _ref42$standaloneTerm === void 0 ? [] : _ref42$standaloneTerm, _ref42$qualifiedTerms = _ref42.qualifiedTerms, qualifiedTerms = _ref42$qualifiedTerms === void 0 ? [] : _ref42$qualifiedTerms;
+        var _ref44 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, _ref44$looseTyped = _ref44.looseTyped, looseTyped = _ref44$looseTyped === void 0 ? false : _ref44$looseTyped, _ref44$stateTerms = _ref44.stateTerms, stateTerms = _ref44$stateTerms === void 0 ? [] : _ref44$stateTerms, _ref44$locations = _ref44.locations, locations = _ref44$locations === void 0 ? [] : _ref44$locations, _ref44$qualifiers = _ref44.qualifiers, qualifiers = _ref44$qualifiers === void 0 ? [] : _ref44$qualifiers, _ref44$standaloneTerm = _ref44.standaloneTerms, standaloneTerms = _ref44$standaloneTerm === void 0 ? [] : _ref44$standaloneTerm, _ref44$qualifiedTerms = _ref44.qualifiedTerms, qualifiedTerms = _ref44$qualifiedTerms === void 0 ? [] : _ref44$qualifiedTerms;
         autocomplete = autocomplete.toLowerCase().trim();
         stateTerms = stateTerms.concat(text.autocomplete.stateTerms);
         if (stateTerms.includes(autocomplete) || autocomplete === '') {
@@ -23067,8 +23125,8 @@
           return text !== '';
         }).join(' ');
       };
-      function getExplicitLabels(_ref43) {
-        var actualNode = _ref43.actualNode;
+      function getExplicitLabels(_ref45) {
+        var actualNode = _ref45.actualNode;
         if (!actualNode.id) {
           return [];
         }
@@ -23183,8 +23241,8 @@
       };
       function findTextMethods(virtualNode) {
         var nativeElementType = text.nativeElementType, nativeTextMethods = text.nativeTextMethods;
-        var nativeType = nativeElementType.find(function(_ref44) {
-          var matches = _ref44.matches;
+        var nativeType = nativeElementType.find(function(_ref46) {
+          var matches = _ref46.matches;
           return axe.commons.matches(virtualNode, matches);
         });
         var methods = nativeType ? [].concat(nativeType.namingMethods) : [];
@@ -23199,12 +23257,12 @@
         button: ''
       };
       text.nativeTextMethods = {
-        valueText: function valueText(_ref45) {
-          var actualNode = _ref45.actualNode;
+        valueText: function valueText(_ref47) {
+          var actualNode = _ref47.actualNode;
           return actualNode.value || '';
         },
-        buttonDefaultText: function buttonDefaultText(_ref46) {
-          var actualNode = _ref46.actualNode;
+        buttonDefaultText: function buttonDefaultText(_ref48) {
+          var actualNode = _ref48.actualNode;
           return defaultButtonValues[actualNode.type] || '';
         },
         tableCaptionText: descendantText.bind(null, 'caption'),
@@ -23225,12 +23283,12 @@
           return ' ';
         }
       };
-      function attrText(attr, _ref47) {
-        var actualNode = _ref47.actualNode;
+      function attrText(attr, _ref49) {
+        var actualNode = _ref49.actualNode;
         return actualNode.getAttribute(attr) || '';
       }
-      function descendantText(nodeName, _ref48, context) {
-        var actualNode = _ref48.actualNode;
+      function descendantText(nodeName, _ref50, context) {
+        var actualNode = _ref50.actualNode;
         nodeName = nodeName.toLowerCase();
         var nodeNames = [ nodeName, actualNode.nodeName.toLowerCase() ].join(',');
         var candidate = actualNode.querySelector(nodeNames);
@@ -23296,7 +23354,7 @@
           return axe.imports.emojiRegexText().test(str);
         }
         if (nonBmp) {
-          return getUnicodeNonBmpRegExp().test(str);
+          return getUnicodeNonBmpRegExp().test(str) || getSupplementaryPrivateUseRegExp().test(str);
         }
         if (punctuations) {
           return getPunctuationRegExp().test(str);
@@ -23321,10 +23379,10 @@
         return /[\u1D00-\u1D7F\u1D80-\u1DBF\u1DC0-\u1DFF\u20A0-\u20CF\u20D0-\u20FF\u2100-\u214F\u2150-\u218F\u2190-\u21FF\u2200-\u22FF\u2300-\u23FF\u2400-\u243F\u2440-\u245F\u2460-\u24FF\u2500-\u257F\u2580-\u259F\u25A0-\u25FF\u2600-\u26FF\u2700-\u27BF\uE000-\uF8FF]/g;
       }
       function getPunctuationRegExp() {
-        return /[\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&()*+,\-.\/:;<=>?@\[\]^_`{|}~]/g;
+        return /[\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&\xa3\xa2\xa5\xa7\u20ac()*+,\-.\/:;<=>?@\[\]^_`{|}~\xb1]/g;
       }
       function getSupplementaryPrivateUseRegExp() {
-        return /[\uDB80-\uDBBF][\uDC00-\uDFFD]/g;
+        return /[\uDB80-\uDBBF][\uDC00-\uDFFF]/g;
       }
       text.unsupported = {
         accessibleNameFromFieldValue: [ 'combobox', 'listbox', 'progressbar' ]