single-file-core 1.6.29 → 1.6.31

package/core/helper.js

@@ -80,6 +80,7 @@ const INVOKERS_SELECTOR = INVOKER_ATTRIBUTE_NAMES.map(attributeName => "[" + att
 const IGNORED_TAG_NAMES = ["SCRIPT", "NOSCRIPT", "META", "LINK", "TEMPLATE"];
 const ROOT_PSEUDO_ELEMENT_NAMES = [":before", ":after"];
 const BLOCK_CONTAINER_DISPLAY_VALUES = ["block", "flow-root", "list-item", "inline-block", "table-cell", "table-caption"];
+const BLOCK_LEVEL_DISPLAY_VALUES = ["block", "flow-root", "list-item", "flex", "grid", "table"];
 const REGEXP_SIMPLE_QUOTES_STRING = /^'(.*?)'$/;
 const REGEXP_DOUBLE_QUOTES_STRING = /^"(.*?)"$/;
 const FONT_WEIGHTS = {
@@ -975,9 +976,11 @@ function getResourcesInfo(win, doc, element, options, data, elementHidden, compu
 	if (tagName == "VIDEO") {
 		const src = element.currentSrc;
 		if (src && !src.startsWith("blob:") && !src.startsWith("data:")) {
-			const computedStyle = getComputedStyle(win, element.parentNode);
+			const computedStyle = getComputedStyle(win, element);
+			const blockLevel = Boolean(computedStyle) && BLOCK_LEVEL_DISPLAY_VALUES.includes(computedStyle.getPropertyValue("display"));
 			data.videos.push({
-				positionParent: computedStyle && computedStyle.getPropertyValue("position"),
+				blockLevel,
+				linkOffset: getVideoLinkOffset(doc, element, blockLevel),
 				src,
 				size: {
 					pxWidth: element.clientWidth,
@@ -1513,6 +1516,29 @@ function flatten(array) {
 	return array.flat ? array.flat() : array.reduce((a, b) => a.concat(Array.isArray(b) ? flatten(b) : b), []);
 }
 
+function getVideoLinkOffset(doc, element, blockLevel) {
+	const offset = { top: 0, left: 0 };
+	if (element.parentNode) {
+		const probeElement = doc.createElement("a");
+		probeElement.style.setProperty("position", "absolute", "important");
+		probeElement.style.setProperty("margin", "0", "important");
+		probeElement.style.setProperty("padding", "0", "important");
+		probeElement.style.setProperty("border", "0", "important");
+		probeElement.style.setProperty("width", "0", "important");
+		probeElement.style.setProperty("height", "0", "important");
+		if (blockLevel) {
+			probeElement.style.setProperty("display", "block", "important");
+		}
+		element.insertAdjacentElement("beforebegin", probeElement);
+		const probeRect = probeElement.getBoundingClientRect();
+		const elementRect = element.getBoundingClientRect();
+		offset.top = Math.round(elementRect.top - probeRect.top);
+		offset.left = Math.round(elementRect.left - probeRect.left);
+		probeElement.remove();
+	}
+	return offset;
+}
+
 function getComputedStyle(win, element, pseudoElement) {
 	try {
 		return win.getComputedStyle(element, pseudoElement);

package/core/index.js

@@ -903,15 +903,18 @@ class Processor {
 			if (attributeValue) {
 				const videoData = this.options.videos[Number(attributeValue)];
 				const src = (videoData && videoData.src) || videoElement.src;
-				if (videoElement && src) {
+				if (src) {
 					const linkElement = this.doc.createElement("a");
 					const imgElement = this.doc.createElement("img");
+					const linkOffset = (videoData && videoData.linkOffset) || { top: 0, left: 0 };
 					linkElement.href = src;
 					linkElement.target = "_blank";
 					linkElement.style.setProperty("z-index", 2147483647, "important");
 					linkElement.style.setProperty("position", "absolute", "important");
-					linkElement.style.setProperty("top", "8px", "important");
-					linkElement.style.setProperty("left", "8px", "important");
+					linkElement.style.setProperty("margin", (linkOffset.top + 8) + "px 0 0 " + (linkOffset.left + 8) + "px", "important");
+					if (videoData && videoData.blockLevel) {
+						linkElement.style.setProperty("display", "block", "important");
+					}
 					linkElement.style.setProperty("width", ICON_SIZE, "important");
 					linkElement.style.setProperty("height", ICON_SIZE, "important");
 					linkElement.style.setProperty("min-width", ICON_SIZE, "important");
@@ -926,11 +929,7 @@ class Processor {
 					imgElement.style.setProperty("max-width", ICON_SIZE, "important");
 					imgElement.style.setProperty("max-height", ICON_SIZE, "important");
 					linkElement.appendChild(imgElement);
-					videoElement.insertAdjacentElement("afterend", linkElement);
-					const positionInlineParent = videoElement.parentNode.style.getPropertyValue("position");
-					if ((!videoData.positionParent && (!positionInlineParent || positionInlineParent != "static")) || videoData.positionParent == "static") {
-						videoElement.parentNode.style.setProperty("position", "relative", "important");
-					}
+					videoElement.insertAdjacentElement("beforebegin", linkElement);
 				}
 			}
 		});

package/core/infobar.js

@@ -233,6 +233,9 @@ function appendInfobar(doc, options, useShadowRoot) {
 		infoData = infoData || "No info";
 		const parentElement = doc.body.tagName == "BODY" ? doc.body : doc.documentElement;
 		const infobarElement = createElement(doc, INFOBAR_TAGNAME, parentElement);
+		const hostStyleElement = doc.createElement("style");
+		hostStyleElement.textContent = `${INFOBAR_TAGNAME}::before,${INFOBAR_TAGNAME}::after{content:none !important}`;
+		infobarElement.appendChild(hostStyleElement);
 		let infobarContainer;
 		if (useShadowRoot) {
 			infobarContainer = infobarElement.attachShadow({ mode: "open" });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "single-file-core",
-	"version": "1.6.29",
+	"version": "1.6.31",
 	"description": "SingleFile Core",
 	"author": "Gildas Lormeau",
 	"license": "AGPL-3.0-or-later",

package/processors/frame-tree/content/content-frame-tree.js

@@ -104,7 +104,9 @@ if (TOP_WINDOW) {
 				return Promise.resolve({});
 			} else if (message.method == GET_OPTIONS_MESSAGE) {
 				const session = sessions.get(message.sessionId);
-				return Promise.resolve({ options: session && session.options });
+				if (session) {
+					return Promise.resolve({ options: session.options });
+				}
 			}
 		});
 	}