feat: simplify SVG source handling and improve preview layout; remove unused styles

This commit is contained in:
sHa
2025-05-15 22:03:02 +03:00
parent 3aaa39b49e
commit 0bce3afd65

View File

@@ -21,13 +21,10 @@
// For SVG source code display // For SVG source code display
let svgSource = ""; let svgSource = "";
let isFetchingSvgSource = false;
// No event dispatching, parent is fully responsible for controlling the component
function isSvgLogo(logo) { function isSvgLogo(logo) {
return logo && logo.format && logo.format.toLowerCase() === "svg"; return logo && logo.format && logo.format.toLowerCase() === "svg";
} // Function to copy SVG source from textarea }
function copySvgSourceFromTextarea() { function copySvgSourceFromTextarea() {
if (svgSource) { if (svgSource) {
try { try {
@@ -35,7 +32,6 @@
return true; return true;
} catch (err) { } catch (err) {
console.error("Error copying from textarea:", err); console.error("Error copying from textarea:", err);
// Show content in prompt as fallback
window.prompt("Copy the SVG source code:", svgSource); window.prompt("Copy the SVG source code:", svgSource);
return false; return false;
} }
@@ -52,7 +48,6 @@
// Only fetch SVG source when displayed // Only fetch SVG source when displayed
$: if (show && logo) { $: if (show && logo) {
// Fetch SVG source when logo is displayed and is an SVG
if (logo.format === "SVG" && !svgSource) { if (logo.format === "SVG" && !svgSource) {
isFetchingSvgSource = true; isFetchingSvgSource = true;
fetchSvgSource(logo.path) fetchSvgSource(logo.path)
@@ -106,29 +101,23 @@
<div class="header-spacer"></div> <div class="header-spacer"></div>
</div> </div>
<div class="preview-body"> <div class="preview-body">
<div <div class="preview-container" use:removeSvgSize>
class="preview-container fullscreen-preview" {#if isSvgLogo(logo)}
role="img" <InlineSvg
aria-label={logo.name} path={logo.path}
> color={logo.colors
<div class="preview-media-wrapper" use:removeSvgSize> ? logo._activeColor || getLogoThemeColor(logo)
{#if isSvgLogo(logo)} : undefined}
<InlineSvg colorConfig={validColorConfig}
path={logo.path} targets={logo.targets}
color={logo.colors sets={logo.sets}
? logo._activeColor || getLogoThemeColor(logo) colors={logo.colors}
: undefined} activeSet={logo._activeSet}
colorConfig={validColorConfig} alt={logo.name}
targets={logo.targets} />
sets={logo.sets} {:else}
colors={logo.colors} <img src={logo.path} alt={logo.name} />
activeSet={logo._activeSet} {/if}
alt={logo.name}
/>
{:else}
<img src={logo.path} alt={logo.name} />
{/if}
</div>
</div> </div>
<div class="right-column"> <div class="right-column">
<div class="logo-details fullscreen-details"> <div class="logo-details fullscreen-details">
@@ -277,6 +266,7 @@
color: #eee; color: #eee;
} }
.preview-container { .preview-container {
flex: 3;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@@ -284,14 +274,17 @@
background-color: var(--color-card); background-color: var(--color-card);
color: var(--color-text); color: var(--color-text);
border-radius: 4px; border-radius: 4px;
height: 100%;
width: 100%;
overflow: hidden; overflow: hidden;
} }
.preview-container img { .preview-container img {
max-width: 100%; max-width: 80%;
max-height: 100%; max-height: 80%;
object-fit: contain; object-fit: contain;
} }
.preview-wrapper { .preview-wrapper {
position: relative; position: relative;
width: 100%; width: 100%;
@@ -303,6 +296,7 @@
border: none; border: none;
overflow: visible; overflow: visible;
} }
.modal-header { .modal-header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@@ -313,19 +307,22 @@
z-index: 2; z-index: 2;
flex: 0 0 auto; flex: 0 0 auto;
} }
.modal-header h2 { .modal-header h2 {
font-size: 2.2rem; font-size: 2.2rem;
color: var(--color-accent, #4f8cff); color: var(--color-accent, #4f8cff);
margin: 0; margin: 0;
} }
.header-spacer { .header-spacer {
width: 70px; width: 70px;
} }
.preview-body { .preview-body {
flex: 1 1 auto; flex: 1 1 auto;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: stretch; align-items: center;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -334,37 +331,6 @@
overflow: visible; overflow: visible;
padding: 1rem; padding: 1rem;
} }
.preview-container.fullscreen-preview {
flex: 3;
display: flex;
align-items: center;
justify-content: center;
min-width: 0;
min-height: 0;
background: var(--color-card);
height: 100%;
width: 100%;
overflow: visible;
}
.preview-media-wrapper {
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
overflow: visible;
}
.preview-media-wrapper img {
width: 100%;
height: 100%;
min-width: 0;
min-height: 0;
object-fit: contain;
display: block;
margin: 0;
max-width: 100%;
max-height: 100%;
}
.logo-details.fullscreen-details { .logo-details.fullscreen-details {
width: 100%; width: 100%;
background: var(--color-card); background: var(--color-card);
@@ -380,16 +346,12 @@
gap: 0.5rem; gap: 0.5rem;
} }
/* Moved to global.css */
.preview-actions-container { .preview-actions-container {
margin-top: 2rem; margin-top: 2rem;
border-top: 1px solid var(--color-border); border-top: 1px solid var(--color-border);
padding-top: 1rem; padding-top: 1rem;
} }
/* These styles are no longer needed as we're using the Actions component */
@media (max-width: 900px) { @media (max-width: 900px) {
.preview-body { .preview-body {
flex-direction: column; flex-direction: column;
@@ -417,8 +379,7 @@
width: 100%; width: 100%;
} }
/* Mobile-specific styles for the preview container */ .preview-container {
.preview-container.fullscreen-preview {
width: 100%; width: 100%;
height: auto; height: auto;
aspect-ratio: 1 / 1; /* Create a square container */ aspect-ratio: 1 / 1; /* Create a square container */
@@ -428,13 +389,13 @@
/* For browsers that don't support aspect-ratio */ /* For browsers that don't support aspect-ratio */
@supports not (aspect-ratio: 1 / 1) { @supports not (aspect-ratio: 1 / 1) {
.preview-container.fullscreen-preview { .preview-container {
height: 0; height: 0;
padding-bottom: 100%; padding-bottom: 100%;
position: relative; position: relative;
} }
.preview-media-wrapper { .preview-container > :global(*) {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
@@ -483,7 +444,6 @@
overflow-y: auto; overflow-y: auto;
} }
/* Moved common color switcher styles to global.css */
.logo-details { .logo-details {
margin-top: 1rem; margin-top: 1rem;