From 38c3c234869e64cd1e62ef8fe29d5a216051d5d4 Mon Sep 17 00:00:00 2001
From: pattonwebz <will@pattonwebz.com>
Date: Thu, 2 Jul 2026 14:33:40 +0100
Subject: [PATCH 1/2] fix: don't flag .ogg audio as video content in
 video_present rule

The Gutenberg Audio block's Ogg Vorbis sample file was being detected
as video because .ogg is also a valid Ogg Theora video extension.
Only treat a .ogg match as video when it isn't attached to an <audio>
element or one of its <source> children.

Fixes equalizedigital/accessibility-checker#1816, PRO-1168.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 src/pageScanner/checks/is-video-detected.js  | 15 +++++++++-
 tests/jest/rules/videoElementPresent.test.js | 30 ++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/pageScanner/checks/is-video-detected.js b/src/pageScanner/checks/is-video-detected.js
index 3b945e7cd..311b44444 100644
--- a/src/pageScanner/checks/is-video-detected.js
+++ b/src/pageScanner/checks/is-video-detected.js
@@ -33,14 +33,27 @@ export default {
 			}
 		}
 
+		// .ogg is the Ogg Vorbis audio extension, but the Ogg container can also carry
+		// Theora video, so it stays in videoExtensions. To avoid flagging ordinary Ogg
+		// Vorbis audio (e.g. the Gutenberg Audio block), only count a .ogg match as video
+		// when it isn't attached to an <audio> element or one of its <source> children.
+		const parentTag = node.parentNode ? node.parentNode.nodeName.toLowerCase() : '';
+		const isInAudioContainer = tag === 'audio' || ( tag === 'source' && parentTag === 'audio' );
+
 		const matchesExtension = videoExtensions.some( ( ext ) => {
 			const srcLower = src.toLowerCase();
 			const dataLower = data.toLowerCase();
 			// Check if the extension is at the end of the string or followed by a query parameter
-			return (
+			const matches = (
 				( srcLower.endsWith( ext ) || srcLower.includes( ext + '?' ) ) ||
 				( dataLower.endsWith( ext ) || dataLower.includes( ext + '?' ) )
 			);
+
+			if ( matches && ext === '.ogg' && isInAudioContainer ) {
+				return false;
+			}
+
+			return matches;
 		} );
 
 		const matchesKeyword = videoKeywords.some( ( keyword ) =>
diff --git a/tests/jest/rules/videoElementPresent.test.js b/tests/jest/rules/videoElementPresent.test.js
index 267500a0e..284f98a77 100644
--- a/tests/jest/rules/videoElementPresent.test.js
+++ b/tests/jest/rules/videoElementPresent.test.js
@@ -101,6 +101,16 @@ describe( 'video_present rule', () => {
 			html: '<video><source src="movie.MP4"></video>',
 			shouldPass: false,
 		},
+		{
+			name: 'detects .ogg file used as a native <video> element src',
+			html: '<video src="movie.ogg" controls></video>',
+			shouldPass: false,
+		},
+		{
+			name: 'detects .ogg source that is not inside an <audio> element',
+			html: '<source src="clip.ogg">',
+			shouldPass: false,
+		},
 
 		// Should not trigger violations
 		{
@@ -135,6 +145,26 @@ describe( 'video_present rule', () => {
 			html: '<audio controls><source src="sound.mp3" type="audio/mpeg"></audio>',
 			shouldPass: true,
 		},
+		{
+			// Direct/minimal case: the <audio> element itself has a .ogg src, exercising the
+			// `tag === 'audio'` path in is-video-detected.js without any wrapping markup.
+			name: 'does not detect a plain <audio> element with a .ogg src',
+			html: '<audio controls src="simple-guitar-melody.ogg"></audio>',
+			shouldPass: true,
+		},
+		{
+			// Regression test for https://github.com/equalizedigital/accessibility-checker/issues/1816 (PRO-1168).
+			// The Gutenberg Audio block's default sample audio is an .ogg (Ogg Vorbis) file, which was
+			// being misidentified as video content because .ogg is also a valid Ogg Theora video extension.
+			name: 'does not detect .ogg audio file in a <figure class="wp-block-audio"> Audio block',
+			html: '<figure class="wp-block-audio"><audio controls src="simple-guitar-melody.ogg"></audio><figcaption>Simple Guitar Melody</figcaption></figure>',
+			shouldPass: true,
+		},
+		{
+			name: 'does not detect .ogg source element inside an <audio> element',
+			html: '<audio controls><source src="simple-guitar-melody.ogg" type="audio/ogg"></audio>',
+			shouldPass: true,
+		},
 		{
 			name: 'does not detect YouTube API script tag',
 			html: '<script type="text/javascript" src="https://www.youtube.com/iframe_api?ver=1.2.6" id="youtube-scripts-js"></script>',

From e770024e16f670d2183671329a3122d764d3e24a Mon Sep 17 00:00:00 2001
From: pattonwebz <will@pattonwebz.com>
Date: Thu, 2 Jul 2026 15:08:46 +0100
Subject: [PATCH 2/2] perf: hoist string/DOM lookups out of the videoExtensions
 loop

Only compute node.parentNode's tag when the node is a <source>, and
lowercase src/data once instead of on every iteration of the
extensions loop, per Gemini code review feedback on PR #1817.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 src/pageScanner/checks/is-video-detected.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pageScanner/checks/is-video-detected.js b/src/pageScanner/checks/is-video-detected.js
index 311b44444..233791ec0 100644
--- a/src/pageScanner/checks/is-video-detected.js
+++ b/src/pageScanner/checks/is-video-detected.js
@@ -37,12 +37,14 @@ export default {
 		// Theora video, so it stays in videoExtensions. To avoid flagging ordinary Ogg
 		// Vorbis audio (e.g. the Gutenberg Audio block), only count a .ogg match as video
 		// when it isn't attached to an <audio> element or one of its <source> children.
-		const parentTag = node.parentNode ? node.parentNode.nodeName.toLowerCase() : '';
-		const isInAudioContainer = tag === 'audio' || ( tag === 'source' && parentTag === 'audio' );
+		const isInAudioContainer = tag === 'audio' || ( tag === 'source' &&
+			node.parentNode &&
+			node.parentNode.nodeName.toLowerCase() === 'audio' );
+
+		const srcLower = src.toLowerCase();
+		const dataLower = data.toLowerCase();
 
 		const matchesExtension = videoExtensions.some( ( ext ) => {
-			const srcLower = src.toLowerCase();
-			const dataLower = data.toLowerCase();
 			// Check if the extension is at the end of the string or followed by a query parameter
 			const matches = (
 				( srcLower.endsWith( ext ) || srcLower.includes( ext + '?' ) ) ||
@@ -57,7 +59,7 @@ export default {
 		} );
 
 		const matchesKeyword = videoKeywords.some( ( keyword ) =>
-			src.toLowerCase().includes( keyword )
+			srcLower.includes( keyword )
 		);
 
 		const matchesType = type.toLowerCase().startsWith( 'video/' );