Merge version_7 into main
Merge version_7 into main
This commit was merged in pull request #12.
This commit is contained in:
@@ -14,7 +14,7 @@ export default function BlogPage() {
|
|||||||
<ThemeProvider
|
<ThemeProvider
|
||||||
defaultButtonVariant="shift-hover"
|
defaultButtonVariant="shift-hover"
|
||||||
defaultTextAnimation="entrance-slide"
|
defaultTextAnimation="entrance-slide"
|
||||||
borderRadius="sharp"
|
borderRadius="rounded"
|
||||||
contentWidth="smallMedium"
|
contentWidth="smallMedium"
|
||||||
sizing="medium"
|
sizing="medium"
|
||||||
background="noise"
|
background="noise"
|
||||||
|
|||||||
@@ -90,7 +90,9 @@ export default function RootLayout({
|
|||||||
' background-color: #4d96ff05 !important;' +
|
' background-color: #4d96ff05 !important;' +
|
||||||
'}' +
|
'}' +
|
||||||
'img.webild-hover,' +
|
'img.webild-hover,' +
|
||||||
'img.webild-selected {' +
|
'img.webild-selected,' +
|
||||||
|
'video.webild-hover,' +
|
||||||
|
'video.webild-selected {' +
|
||||||
' outline-offset: 2px !important;' +
|
' outline-offset: 2px !important;' +
|
||||||
'}' +
|
'}' +
|
||||||
'.webild-element-type-label {' +
|
'.webild-element-type-label {' +
|
||||||
@@ -162,6 +164,10 @@ export default function RootLayout({
|
|||||||
return 'Image';
|
return 'Image';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (tagName === 'video') {
|
||||||
|
return 'Video';
|
||||||
|
}
|
||||||
|
|
||||||
const backgroundImage = computedStyle.backgroundImage;
|
const backgroundImage = computedStyle.backgroundImage;
|
||||||
if (backgroundImage && backgroundImage !== 'none') {
|
if (backgroundImage && backgroundImage !== 'none') {
|
||||||
const urlMatch = backgroundImage.match(/url(['"]?([^'")]+)['"]?)/);
|
const urlMatch = backgroundImage.match(/url(['"]?([^'")]+)['"]?)/);
|
||||||
@@ -244,6 +250,38 @@ export default function RootLayout({
|
|||||||
return url;
|
return url;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const getMediaTypeFromUrl = (url) => {
|
||||||
|
const videoExts = ['.mp4', '.webm', '.ogg', '.mov', '.avi', '.mkv', '.m4v', '.wmv'];
|
||||||
|
const imageExts = ['.jpg', '.jpeg', '.png', '.gif', '.webp', '.svg', '.bmp', '.ico', '.tiff', '.avif'];
|
||||||
|
try {
|
||||||
|
const pathname = new URL(url).pathname.toLowerCase();
|
||||||
|
if (videoExts.some(function(ext) { return pathname.endsWith(ext); })) return 'video';
|
||||||
|
if (imageExts.some(function(ext) { return pathname.endsWith(ext); })) return 'image';
|
||||||
|
} catch(e) {}
|
||||||
|
return 'unknown';
|
||||||
|
};
|
||||||
|
|
||||||
|
const swapMediaElement = (oldEl, newTag, newSrc) => {
|
||||||
|
const newEl = document.createElement(newTag);
|
||||||
|
Array.from(oldEl.attributes).forEach(function(attr) {
|
||||||
|
if (attr.name !== 'src' && attr.name !== 'alt' && attr.name !== 'srcset' && attr.name !== 'autoplay' && attr.name !== 'loop' && attr.name !== 'muted' && attr.name !== 'playsinline') {
|
||||||
|
try { newEl.setAttribute(attr.name, attr.value); } catch(e) {}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
newEl.style.cssText = oldEl.style.cssText;
|
||||||
|
if (newTag === 'video') {
|
||||||
|
newEl.setAttribute('autoplay', '');
|
||||||
|
newEl.setAttribute('loop', '');
|
||||||
|
newEl.setAttribute('muted', '');
|
||||||
|
newEl.setAttribute('playsinline', '');
|
||||||
|
}
|
||||||
|
newEl.src = newSrc;
|
||||||
|
if (oldEl.parentNode) {
|
||||||
|
oldEl.parentNode.replaceChild(newEl, oldEl);
|
||||||
|
}
|
||||||
|
return newEl;
|
||||||
|
};
|
||||||
|
|
||||||
const getElementInfo = (element, assignId = false) => {
|
const getElementInfo = (element, assignId = false) => {
|
||||||
const rect = element.getBoundingClientRect();
|
const rect = element.getBoundingClientRect();
|
||||||
const tagName = element.tagName.toLowerCase();
|
const tagName = element.tagName.toLowerCase();
|
||||||
@@ -287,6 +325,17 @@ export default function RootLayout({
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (tagName === 'video') {
|
||||||
|
const rawSrc = element.src || element.currentSrc || (element.querySelector('source') && element.querySelector('source').src) || '';
|
||||||
|
const resolvedSrc = extractOriginalUrl(rawSrc);
|
||||||
|
info.imageData = {
|
||||||
|
src: resolvedSrc,
|
||||||
|
alt: element.getAttribute('aria-label') || undefined,
|
||||||
|
isBackground: false,
|
||||||
|
isVideo: true
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
const computedStyle = window.getComputedStyle(element);
|
const computedStyle = window.getComputedStyle(element);
|
||||||
const backgroundImage = computedStyle.backgroundImage;
|
const backgroundImage = computedStyle.backgroundImage;
|
||||||
if (backgroundImage && backgroundImage !== 'none') {
|
if (backgroundImage && backgroundImage !== 'none') {
|
||||||
@@ -334,7 +383,8 @@ export default function RootLayout({
|
|||||||
const tagName = element.tagName?.toLowerCase();
|
const tagName = element.tagName?.toLowerCase();
|
||||||
if (invalidElements.includes(tagName)) return false;
|
if (invalidElements.includes(tagName)) return false;
|
||||||
const isImage = tagName === 'img';
|
const isImage = tagName === 'img';
|
||||||
if (isImage) return true;
|
const isVideo = tagName === 'video';
|
||||||
|
if (isImage || isVideo) return true;
|
||||||
const hasInnerHTML = element.innerHTML && element.innerHTML.trim().length > 0;
|
const hasInnerHTML = element.innerHTML && element.innerHTML.trim().length > 0;
|
||||||
const hasTextContent = element.textContent && element.textContent.trim().length > 0;
|
const hasTextContent = element.textContent && element.textContent.trim().length > 0;
|
||||||
const hasChildren = element.children && element.children.length > 0;
|
const hasChildren = element.children && element.children.length > 0;
|
||||||
@@ -374,7 +424,7 @@ export default function RootLayout({
|
|||||||
node.nodeType === Node.TEXT_NODE && node.textContent && node.textContent.trim().length > 0
|
node.nodeType === Node.TEXT_NODE && node.textContent && node.textContent.trim().length > 0
|
||||||
);
|
);
|
||||||
|
|
||||||
const hasImages = element.tagName === 'IMG' || computedStyle.backgroundImage !== 'none' || element.querySelector('img');
|
const hasImages = element.tagName === 'IMG' || element.tagName === 'VIDEO' || computedStyle.backgroundImage !== 'none' || element.querySelector('img') || element.querySelector('video');
|
||||||
const isInteractive = ['BUTTON', 'A', 'INPUT', 'SELECT', 'TEXTAREA'].includes(element.tagName);
|
const isInteractive = ['BUTTON', 'A', 'INPUT', 'SELECT', 'TEXTAREA'].includes(element.tagName);
|
||||||
const hasFewChildren = element.children.length <= 3;
|
const hasFewChildren = element.children.length <= 3;
|
||||||
const area = rect.width * rect.height;
|
const area = rect.width * rect.height;
|
||||||
@@ -1055,11 +1105,22 @@ export default function RootLayout({
|
|||||||
updateButtonText(element, change.oldValue);
|
updateButtonText(element, change.oldValue);
|
||||||
}
|
}
|
||||||
} else if (change.type === 'replaceImage') {
|
} else if (change.type === 'replaceImage') {
|
||||||
const isBackground = element.tagName.toLowerCase() !== 'img';
|
const revertTag = element.tagName.toLowerCase();
|
||||||
|
const isBackground = revertTag !== 'img' && revertTag !== 'video';
|
||||||
if (isBackground) {
|
if (isBackground) {
|
||||||
element.style.backgroundImage = change.oldValue ? 'url(' + change.oldValue + ')' : '';
|
element.style.backgroundImage = change.oldValue ? 'url(' + change.oldValue + ')' : '';
|
||||||
} else {
|
} else {
|
||||||
element.src = change.oldValue;
|
const oldMediaType = getMediaTypeFromUrl(change.oldValue);
|
||||||
|
if (revertTag === 'video' && oldMediaType === 'image') {
|
||||||
|
swapMediaElement(element, 'img', change.oldValue);
|
||||||
|
} else if (revertTag === 'img' && oldMediaType === 'video') {
|
||||||
|
swapMediaElement(element, 'video', change.oldValue);
|
||||||
|
} else if (revertTag === 'video') {
|
||||||
|
element.src = change.oldValue;
|
||||||
|
element.load();
|
||||||
|
} else {
|
||||||
|
element.src = change.oldValue;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -1159,7 +1220,7 @@ export default function RootLayout({
|
|||||||
if (!isActive) return;
|
if (!isActive) return;
|
||||||
|
|
||||||
if (e.data.type === 'webild-replace-image') {
|
if (e.data.type === 'webild-replace-image') {
|
||||||
const { selector, newSrc, isBackground } = e.data.data;
|
const { selector, newSrc, isBackground, allowMediaTypeSwap } = e.data.data;
|
||||||
let element = null;
|
let element = null;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -1190,7 +1251,32 @@ export default function RootLayout({
|
|||||||
replaced = true;
|
replaced = true;
|
||||||
} else if (element.tagName.toLowerCase() === 'img') {
|
} else if (element.tagName.toLowerCase() === 'img') {
|
||||||
oldValue = element.src;
|
oldValue = element.src;
|
||||||
element.src = newSrc;
|
const newMediaType = getMediaTypeFromUrl(newSrc);
|
||||||
|
if (newMediaType === 'video' && allowMediaTypeSwap) {
|
||||||
|
const swapped = swapMediaElement(element, 'video', newSrc);
|
||||||
|
if (selectedElement === element) selectedElement = swapped;
|
||||||
|
element = swapped;
|
||||||
|
} else {
|
||||||
|
element.src = newSrc;
|
||||||
|
}
|
||||||
|
replaced = true;
|
||||||
|
} else if (element.tagName.toLowerCase() === 'video') {
|
||||||
|
oldValue = element.src || element.currentSrc || '';
|
||||||
|
const newMediaType = getMediaTypeFromUrl(newSrc);
|
||||||
|
const sources = element.querySelectorAll('source');
|
||||||
|
if (newMediaType === 'image' && allowMediaTypeSwap) {
|
||||||
|
const swapped = swapMediaElement(element, 'img', newSrc);
|
||||||
|
if (selectedElement === element) selectedElement = swapped;
|
||||||
|
element = swapped;
|
||||||
|
} else {
|
||||||
|
if (sources.length > 0) {
|
||||||
|
sources.forEach(function(source) { source.src = newSrc; });
|
||||||
|
element.load();
|
||||||
|
} else {
|
||||||
|
element.src = newSrc;
|
||||||
|
element.load();
|
||||||
|
}
|
||||||
|
}
|
||||||
replaced = true;
|
replaced = true;
|
||||||
} else {
|
} else {
|
||||||
const hasBackgroundImage = window.getComputedStyle(element).backgroundImage !== 'none';
|
const hasBackgroundImage = window.getComputedStyle(element).backgroundImage !== 'none';
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ export default function LandingPage() {
|
|||||||
<ThemeProvider
|
<ThemeProvider
|
||||||
defaultButtonVariant="shift-hover"
|
defaultButtonVariant="shift-hover"
|
||||||
defaultTextAnimation="entrance-slide"
|
defaultTextAnimation="entrance-slide"
|
||||||
borderRadius="sharp"
|
borderRadius="rounded"
|
||||||
contentWidth="smallMedium"
|
contentWidth="smallMedium"
|
||||||
sizing="medium"
|
sizing="medium"
|
||||||
background="noise"
|
background="noise"
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ export default function ProductPage({ params }: ProductPageProps) {
|
|||||||
<ThemeProvider
|
<ThemeProvider
|
||||||
defaultButtonVariant="shift-hover"
|
defaultButtonVariant="shift-hover"
|
||||||
defaultTextAnimation="entrance-slide"
|
defaultTextAnimation="entrance-slide"
|
||||||
borderRadius="sharp"
|
borderRadius="rounded"
|
||||||
contentWidth="smallMedium"
|
contentWidth="smallMedium"
|
||||||
sizing="medium"
|
sizing="medium"
|
||||||
background="noise"
|
background="noise"
|
||||||
@@ -114,7 +114,7 @@ export default function ProductPage({ params }: ProductPageProps) {
|
|||||||
<ThemeProvider
|
<ThemeProvider
|
||||||
defaultButtonVariant="shift-hover"
|
defaultButtonVariant="shift-hover"
|
||||||
defaultTextAnimation="entrance-slide"
|
defaultTextAnimation="entrance-slide"
|
||||||
borderRadius="sharp"
|
borderRadius="rounded"
|
||||||
contentWidth="smallMedium"
|
contentWidth="smallMedium"
|
||||||
sizing="medium"
|
sizing="medium"
|
||||||
background="noise"
|
background="noise"
|
||||||
@@ -164,7 +164,7 @@ export default function ProductPage({ params }: ProductPageProps) {
|
|||||||
<ThemeProvider
|
<ThemeProvider
|
||||||
defaultButtonVariant="shift-hover"
|
defaultButtonVariant="shift-hover"
|
||||||
defaultTextAnimation="entrance-slide"
|
defaultTextAnimation="entrance-slide"
|
||||||
borderRadius="sharp"
|
borderRadius="rounded"
|
||||||
contentWidth="smallMedium"
|
contentWidth="smallMedium"
|
||||||
sizing="medium"
|
sizing="medium"
|
||||||
background="noise"
|
background="noise"
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ export default function ShopPage() {
|
|||||||
<ThemeProvider
|
<ThemeProvider
|
||||||
defaultButtonVariant="shift-hover"
|
defaultButtonVariant="shift-hover"
|
||||||
defaultTextAnimation="entrance-slide"
|
defaultTextAnimation="entrance-slide"
|
||||||
borderRadius="sharp"
|
borderRadius="rounded"
|
||||||
contentWidth="smallMedium"
|
contentWidth="smallMedium"
|
||||||
sizing="medium"
|
sizing="medium"
|
||||||
background="noise"
|
background="noise"
|
||||||
@@ -63,7 +63,7 @@ export default function ShopPage() {
|
|||||||
<ThemeProvider
|
<ThemeProvider
|
||||||
defaultButtonVariant="shift-hover"
|
defaultButtonVariant="shift-hover"
|
||||||
defaultTextAnimation="entrance-slide"
|
defaultTextAnimation="entrance-slide"
|
||||||
borderRadius="sharp"
|
borderRadius="rounded"
|
||||||
contentWidth="smallMedium"
|
contentWidth="smallMedium"
|
||||||
sizing="medium"
|
sizing="medium"
|
||||||
background="noise"
|
background="noise"
|
||||||
|
|||||||
Reference in New Issue
Block a user