Skip to content
This repository has been archived by the owner on Mar 19, 2021. It is now read-only.

Commit

Permalink
feat: use requestIdleCallback when possible (#61)
Browse files Browse the repository at this point in the history
This patch builds on #59 (hat tip to @agreene-coursera!!) and uses `requestIdleCallback` rather than `setTimeout` in environments that support it. If the host environment does not support `requestIdleCallback`, a shim will be used (via [`npmjs.com/requestidlecallback`](https://www.npmjs.com/package/requestidlecallback)).

Closes #59.
  • Loading branch information
stephenmathieson authored Jan 9, 2019
1 parent f605d9d commit a9bff13
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 60 deletions.
126 changes: 67 additions & 59 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
/* global document, window, Promise */
var axeCore = require('axe-core');
var rIC = require('requestidlecallback');
var after = require('./after');

var requestIdleCallback = rIC.request;
var cancelIdleCallback = rIC.cancel;

var React = undefined;
var ReactDOM = undefined;

Expand All @@ -11,7 +16,7 @@ var moderate = 'color:orange;font-weight:bold;';
var minor = 'color:orange;font-weight:normal;';
var defaultReset = 'font-color:black;font-weight:normal;';

var timer;
var idleId;
var timeout;
var _createElement;
var components = {};
Expand Down Expand Up @@ -108,75 +113,78 @@ function createDeferred() {
}

function checkAndReport(node, timeout) {
if (timer) {
clearTimeout(timer);
timer = undefined;
if (idleId) {
cancelIdleCallback(idleId);
idleId = undefined;
}

var deferred = createDeferred();

nodes.push(node);
timer = setTimeout(function() {
var n = getCommonParent(nodes);
if (n.nodeName.toLowerCase() === 'html') {
// if the only common parent is the body, then analyze the whole page
n = document;
}
axeCore.run(n, { reporter: 'v2' }, function(error, results) {
if (error) {
return deferred.reject(error);
idleId = requestIdleCallback(
function() {
var n = getCommonParent(nodes);
if (n.nodeName.toLowerCase() === 'html') {
// if the only common parent is the body, then analyze the whole page
n = document;
}
axeCore.run(n, { reporter: 'v2' }, function(error, results) {
if (error) {
return deferred.reject(error);
}

results.violations = results.violations.filter(function(result) {
result.nodes = result.nodes.filter(function(node) {
var key = node.target.toString() + result.id;
var retVal = !cache[key];
cache[key] = key;
return retVal;
results.violations = results.violations.filter(function(result) {
result.nodes = result.nodes.filter(function(node) {
var key = node.target.toString() + result.id;
var retVal = !cache[key];
cache[key] = key;
return retVal;
});
return !!result.nodes.length;
});
return !!result.nodes.length;
});
if (results.violations.length) {
console.group('%cNew aXe issues', serious);
results.violations.forEach(function(result) {
var fmt;
switch (result.impact) {
case 'critical':
fmt = critical;
break;
case 'serious':
fmt = serious;
break;
case 'moderate':
fmt = moderate;
break;
case 'minor':
fmt = minor;
break;
default:
fmt = minor;
break;
}
console.groupCollapsed(
'%c%s: %c%s %s',
fmt,
result.impact,
defaultReset,
result.help,
result.helpUrl
);
result.nodes.forEach(function(node) {
failureSummary(node, 'any');
failureSummary(node, 'none');
if (results.violations.length) {
console.group('%cNew aXe issues', serious);
results.violations.forEach(function(result) {
var fmt;
switch (result.impact) {
case 'critical':
fmt = critical;
break;
case 'serious':
fmt = serious;
break;
case 'moderate':
fmt = moderate;
break;
case 'minor':
fmt = minor;
break;
default:
fmt = minor;
break;
}
console.groupCollapsed(
'%c%s: %c%s %s',
fmt,
result.impact,
defaultReset,
result.help,
result.helpUrl
);
result.nodes.forEach(function(node) {
failureSummary(node, 'any');
failureSummary(node, 'none');
});
console.groupEnd();
});
console.groupEnd();
});
console.groupEnd();
}
}

deferred.resolve();
});
}, timeout);
deferred.resolve();
});
},
{ timeout: timeout }
);

return deferred.promise;
}
Expand Down
5 changes: 5 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
"author": "Dylan Barrell (dylan@barrell.com)",
"license": "MPL-2.0",
"dependencies": {
"axe-core": "^3.0.0"
"axe-core": "^3.0.0",
"requestidlecallback": "^0.3.0"
},
"devDependencies": {
"cypress": "^3.0.3",
Expand Down

0 comments on commit a9bff13

Please sign in to comment.