fix figcaption a11y warning - #991

sveltejs · Dec 10, 2017 · f33b883 · f33b883
1 parent cf94217
commit f33b883
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/validate/html/a11y.ts b/src/validate/html/a11y.ts
@@ -159,8 +159,15 @@ export default function a11y(
 			if (parent.name !== 'figure') {
 				validator.warn(`A11y: <figcaption> must be an immediate child of <figure>`, node.start);
 			} else {
-				const index = parent.children.indexOf(node);
-				if (index !== 0 && index !== parent.children.length - 1) {
+				const children = parent.children.filter(node => {
+					if (node.type === 'Comment') return false;
+					if (node.type === 'Text') return /\S/.test(node.data);
+					return true;
+				});
+
+				const index = children.indexOf(node);
+
+				if (index !== 0 && index !== children.length - 1) {
 					validator.warn(`A11y: <figcaption> must be first or last child of <figure>`, node.start);
 				}
 			}

diff --git a/test/validator/samples/a11y-figcaption-right-place/input.html b/test/validator/samples/a11y-figcaption-right-place/input.html
@@ -0,0 +1,7 @@
+<figure>
+	<img src='foo.jpg' alt='a picture of a foo'>
+
+	<figcaption>
+		a foo in its natural habitat
+	</figcaption>
+</figure>
diff --git a/test/validator/samples/a11y-figcaption-right-place/warnings.json b/test/validator/samples/a11y-figcaption-right-place/warnings.json
@@ -0,0 +1 @@
+[]