mirror of
https://github.com/shadoll/sLogos.git
synced 2025-12-20 04:27:59 +00:00
fix: Update collection label retrieval to support titles and improve SVG error handling
This commit is contained in:
@@ -45,7 +45,8 @@
|
||||
dropdownOpen = false;
|
||||
}
|
||||
|
||||
$: currentLabel = (collections.find(c => c.name === collection)?.label || "Logo Gallery").replace(/s$/, "");
|
||||
$: currentCollectionObj = collections.find(c => c.name === collection);
|
||||
$: currentLabel = (currentCollectionObj?.title || currentCollectionObj?.label || "Logo Gallery").replace(/s$/, "");
|
||||
</script>
|
||||
|
||||
<header class="main-header">
|
||||
@@ -55,7 +56,7 @@
|
||||
<img src="favicon.svg" alt="Logo Gallery icon" />
|
||||
</div>
|
||||
<button class="collection-title-btn" on:click={handleTitleClick} aria-haspopup="listbox" aria-expanded={dropdownOpen}>
|
||||
{currentLabel} Gallery <span class="triangle">▼</span>
|
||||
{currentLabel} <span class="triangle">▼</span>
|
||||
</button>
|
||||
{#if dropdownOpen}
|
||||
<ul class="collection-dropdown" role="listbox">
|
||||
@@ -72,7 +73,7 @@
|
||||
handleCollectionSelect(c.name);
|
||||
}
|
||||
}}
|
||||
>{c.label} Gallery</li>
|
||||
>{c.title} Gallery</li>
|
||||
{/each}
|
||||
</ul>
|
||||
{/if}
|
||||
@@ -107,6 +108,7 @@
|
||||
{getTagObj}
|
||||
{compactMode}
|
||||
{setCompactMode}
|
||||
collection={currentCollectionObj}
|
||||
/>
|
||||
<ListViewSwitcher
|
||||
{viewMode}
|
||||
|
||||
@@ -12,111 +12,122 @@
|
||||
let svgSource = ""; // Store the updated SVG source code
|
||||
|
||||
async function fetchAndColorSvg() {
|
||||
const res = await fetch(path);
|
||||
let text = await res.text();
|
||||
if (!color) {
|
||||
// No user-selected color, add currentColor to ensure theme colors are applied
|
||||
try {
|
||||
const res = await fetch(path);
|
||||
if (!res.ok) {
|
||||
svgHtml = `<svg width='100%' height='100%' viewBox='0 0 64 64' fill='none' xmlns='http://www.w3.org/2000/svg'><rect width='64' height='64' fill='#eee'/><line x1='16' y1='16' x2='48' y2='48' stroke='#888' stroke-width='4'/><line x1='48' y1='16' x2='16' y2='48' stroke='#888' stroke-width='4'/></svg>`;
|
||||
svgSource = svgHtml;
|
||||
return;
|
||||
}
|
||||
let text = await res.text();
|
||||
if (!color) {
|
||||
// No user-selected color, add currentColor to ensure theme colors are applied
|
||||
const parser = new DOMParser();
|
||||
const doc = parser.parseFromString(text, "image/svg+xml");
|
||||
const svg = doc.documentElement;
|
||||
|
||||
// Set currentColor on SVG element if no fill is specified
|
||||
if (!svg.hasAttribute("fill")) {
|
||||
svg.setAttribute("fill", "currentColor");
|
||||
}
|
||||
|
||||
svgHtml = doc.documentElement.outerHTML;
|
||||
return;
|
||||
}
|
||||
// Parse and update color only if user selected
|
||||
const parser = new DOMParser();
|
||||
const doc = parser.parseFromString(text, "image/svg+xml");
|
||||
const svg = doc.documentElement;
|
||||
|
||||
// Set currentColor on SVG element if no fill is specified
|
||||
if (!svg.hasAttribute("fill")) {
|
||||
svg.setAttribute("fill", "currentColor");
|
||||
}
|
||||
|
||||
svgHtml = doc.documentElement.outerHTML;
|
||||
return;
|
||||
}
|
||||
// Parse and update color only if user selected
|
||||
const parser = new DOMParser();
|
||||
const doc = parser.parseFromString(text, "image/svg+xml");
|
||||
// 1. Parse <style> rules and apply as inline attributes before removing <style>
|
||||
const styleEls = Array.from(doc.querySelectorAll("style"));
|
||||
styleEls.forEach((styleEl) => {
|
||||
const css = styleEl.textContent;
|
||||
// Only handle simple .class { ... } rules
|
||||
const regex = /\.([\w-]+)\s*{([^}]*)}/g;
|
||||
let match;
|
||||
while ((match = regex.exec(css))) {
|
||||
const className = match[1];
|
||||
const rules = match[2];
|
||||
// Find all elements with this class
|
||||
doc.querySelectorAll("." + className).forEach((el) => {
|
||||
rules.split(";").forEach((rule) => {
|
||||
const [prop, value] = rule.split(":").map((s) => s && s.trim());
|
||||
if (prop && value) {
|
||||
// Apply all style properties, not just fill/stroke
|
||||
el.setAttribute(
|
||||
prop.replace(/-([a-z])/g, (g) => g[1].toUpperCase()),
|
||||
value,
|
||||
);
|
||||
}
|
||||
// 1. Parse <style> rules and apply as inline attributes before removing <style>
|
||||
const styleEls = Array.from(doc.querySelectorAll("style"));
|
||||
styleEls.forEach((styleEl) => {
|
||||
const css = styleEl.textContent;
|
||||
// Only handle simple .class { ... } rules
|
||||
const regex = /\.([\w-]+)\s*{([^}]*)}/g;
|
||||
let match;
|
||||
while ((match = regex.exec(css))) {
|
||||
const className = match[1];
|
||||
const rules = match[2];
|
||||
// Find all elements with this class
|
||||
doc.querySelectorAll("." + className).forEach((el) => {
|
||||
rules.split(";").forEach((rule) => {
|
||||
const [prop, value] = rule.split(":").map((s) => s && s.trim());
|
||||
if (prop && value) {
|
||||
// Apply all style properties, not just fill/stroke
|
||||
el.setAttribute(
|
||||
prop.replace(/-([a-z])/g, (g) => g[1].toUpperCase()),
|
||||
value,
|
||||
);
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
// Remove all <style> elements
|
||||
styleEls.forEach((styleEl) => styleEl.remove());
|
||||
// Handle the new format with targets and sets if available
|
||||
if (targets && sets && activeSet && typeof activeSet === 'string' && sets[activeSet]) {
|
||||
try {
|
||||
// Get the color assignments from the active set
|
||||
const colorAssignments = sets[activeSet];
|
||||
}
|
||||
});
|
||||
// Remove all <style> elements
|
||||
styleEls.forEach((styleEl) => styleEl.remove());
|
||||
// Handle the new format with targets and sets if available
|
||||
if (targets && sets && activeSet && typeof activeSet === 'string' && sets[activeSet]) {
|
||||
try {
|
||||
// Get the color assignments from the active set
|
||||
const colorAssignments = sets[activeSet];
|
||||
|
||||
// Apply each target-color pair
|
||||
for (const [targetName, colorName] of Object.entries(colorAssignments)) {
|
||||
if (targets[targetName] && colors && colors[colorName]) {
|
||||
// Get the selector and determine if it's for fill or stroke
|
||||
const targetInfo = targets[targetName];
|
||||
// Apply each target-color pair
|
||||
for (const [targetName, colorName] of Object.entries(colorAssignments)) {
|
||||
if (targets[targetName] && colors && colors[colorName]) {
|
||||
// Get the selector and determine if it's for fill or stroke
|
||||
const targetInfo = targets[targetName];
|
||||
|
||||
// Parse the selector to extract the target and attribute (fill/stroke)
|
||||
let selector, attribute;
|
||||
// Parse the selector to extract the target and attribute (fill/stroke)
|
||||
let selector, attribute;
|
||||
|
||||
if (typeof targetInfo === 'string') {
|
||||
if (targetInfo.includes('&stroke')) {
|
||||
// Format: "#element&stroke" - target stroke attribute
|
||||
selector = targetInfo.split('&stroke')[0];
|
||||
attribute = 'stroke';
|
||||
} else if (targetInfo.includes('&fill')) {
|
||||
// Format: "#element&fill" - target fill attribute
|
||||
selector = targetInfo.split('&fill')[0];
|
||||
attribute = 'fill';
|
||||
if (typeof targetInfo === 'string') {
|
||||
if (targetInfo.includes('&stroke')) {
|
||||
// Format: "#element&stroke" - target stroke attribute
|
||||
selector = targetInfo.split('&stroke')[0];
|
||||
attribute = 'stroke';
|
||||
} else if (targetInfo.includes('&fill')) {
|
||||
// Format: "#element&fill" - target fill attribute
|
||||
selector = targetInfo.split('&fill')[0];
|
||||
attribute = 'fill';
|
||||
} else {
|
||||
// Default is fill if not specified
|
||||
selector = targetInfo;
|
||||
attribute = 'fill';
|
||||
}
|
||||
} else {
|
||||
// Default is fill if not specified
|
||||
// Fallback for older format
|
||||
selector = targetInfo;
|
||||
attribute = 'fill';
|
||||
}
|
||||
} else {
|
||||
// Fallback for older format
|
||||
selector = targetInfo;
|
||||
attribute = 'fill';
|
||||
|
||||
// Proceed with selecting elements and applying colors
|
||||
const targetElements = doc.querySelectorAll(selector);
|
||||
const targetColor = colors[colorName];
|
||||
|
||||
// Apply the color to all elements matching this selector
|
||||
targetElements.forEach(el => {
|
||||
if (colorName === "none") {
|
||||
// Special case for 'none' value
|
||||
el.setAttribute(attribute, "none");
|
||||
} else if (attribute === 'fill') {
|
||||
el.setAttribute("fill", targetColor);
|
||||
} else if (attribute === 'stroke') {
|
||||
el.setAttribute("stroke", targetColor);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Proceed with selecting elements and applying colors
|
||||
const targetElements = doc.querySelectorAll(selector);
|
||||
const targetColor = colors[colorName];
|
||||
|
||||
// Apply the color to all elements matching this selector
|
||||
targetElements.forEach(el => {
|
||||
if (colorName === "none") {
|
||||
// Special case for 'none' value
|
||||
el.setAttribute(attribute, "none");
|
||||
} else if (attribute === 'fill') {
|
||||
el.setAttribute("fill", targetColor);
|
||||
} else if (attribute === 'stroke') {
|
||||
el.setAttribute("stroke", targetColor);
|
||||
}
|
||||
});
|
||||
}
|
||||
} catch (err) {
|
||||
console.error("Error applying color set:", err);
|
||||
}
|
||||
} catch (err) {
|
||||
console.error("Error applying color set:", err);
|
||||
}
|
||||
svgHtml = doc.documentElement.outerHTML;
|
||||
// Update the svgSource property to store the modified SVG code
|
||||
svgSource = doc.documentElement.outerHTML;
|
||||
} catch (error) {
|
||||
console.error("Error fetching or processing SVG:", error);
|
||||
svgHtml = `<svg width='100%' height='100%' viewBox='0 0 64 64' fill='none' xmlns='http://www.w3.org/2000/svg'><rect width='64' height='64' fill='#eee'/><line x1='16' y1='16' x2='48' y2='48' stroke='#888' stroke-width='4'/><line x1='48' y1='16' x2='16' y2='48' stroke='#888' stroke-width='4'/></svg>`;
|
||||
svgSource = svgHtml;
|
||||
}
|
||||
svgHtml = doc.documentElement.outerHTML;
|
||||
// Update the svgSource property to store the modified SVG code
|
||||
svgSource = doc.documentElement.outerHTML;
|
||||
}
|
||||
|
||||
// Export the svgSource so it can be accessed from outside
|
||||
|
||||
Reference in New Issue
Block a user