feat: remove browser check to simplicity (AI dumb)

This commit is contained in:
2026-02-04 03:06:50 +05:00
parent 24b4c41039
commit e9c9dc1d69
6 changed files with 110 additions and 169 deletions
+66 -58
View File
@@ -1,34 +1,22 @@
<script lang="ts"> <script lang="ts">
import { onMount } from "svelte"; import { onMount } from "svelte";
import { browser } from "$app/environment"; import CropperJS from "cropperjs";
import type { ImageCropResult } from "../lib/types/panel"; import type { ImageCropResult } from "../lib/types/panel";
import { ImageService } from "../lib/services/imageService"; import { ImageService } from "../lib/services/imageService";
import { uiStore, setLoading } from "../stores/uiStore"; import { uiStore, setLoading } from "../stores/uiStore";
let Cropper = $state.raw<any>(undefined);
onMount(async () => { let {
if (browser) { imageSrc,
const cropperModule = await import("cropperjs"); onCropComplete,
Cropper = cropperModule.default || cropperModule; onCancel,
}: {
// Импортируем стили только на клиенте
// Инициализируем cropper после загрузки
initializeCropper();
}
});
let { imageSrc, onCropComplete, onCancel }: {
imageSrc: string; imageSrc: string;
onCropComplete: (croppedImage: string) => void; onCropComplete: (croppedImage: string) => void;
onCancel: () => void; onCancel: () => void;
} = $props(); } = $props();
let imageElement: HTMLImageElement; let imageElement: HTMLImageElement;
let cropper: Cropper | null = null; let cropper: CropperJS | null = null;
let isProcessing = $state(false); let isProcessing = $state(false);
let errorMessage = $state<string | null>(null); let errorMessage = $state<string | null>(null);
@@ -44,27 +32,12 @@
}); });
function initializeCropper() { function initializeCropper() {
console.log("initializeCropper called, imageElement:", !!imageElement, "Cropper:", !!Cropper); console.log("initializeCropper called, imageElement:", !!imageElement, "CropperJS:", !!CropperJS);
if (!imageElement || !Cropper) { if (!imageElement || !CropperJS) {
return; return;
} }
cropper = new Cropper(imageElement, { cropper = new CropperJS(imageElement);
aspectRatio: NaN, // Allow any aspect ratio
viewMode: 1,
dragMode: "move",
autoCropArea: 1,
restore: false,
guides: true,
center: true,
highlight: false,
cropBoxMovable: true,
cropBoxResizable: true,
toggleDragModeOnDblclick: false,
minCropBoxWidth: 320,
minCropBoxHeight: 50,
responsive: true,
});
} }
async function handleCrop() { async function handleCrop() {
@@ -89,8 +62,6 @@
// Используем метод $toCanvas для получения HTMLCanvasElement // Используем метод $toCanvas для получения HTMLCanvasElement
const canvas = await cropperCanvasElement.$toCanvas({ const canvas = await cropperCanvasElement.$toCanvas({
width: 320, width: 320,
imageSmoothingEnabled: true,
imageSmoothingQuality: "high",
}); });
if (!canvas) { if (!canvas) {
@@ -125,33 +96,19 @@
<div class="cropper-container"> <div class="cropper-container">
<div class="cropper-wrapper"> <div class="cropper-wrapper">
<img <img bind:this={imageElement} src={imageSrc} alt="" class="cropper-image" />
bind:this={imageElement}
src={imageSrc}
alt=""
class="cropper-image"
/>
</div> </div>
{#if errorMessage} {#if errorMessage}
<div class="error-message"> <div class="error-message">
<strong>Ошибка:</strong> {errorMessage} <strong>Ошибка:</strong>
{errorMessage}
</div> </div>
{/if} {/if}
<div class="cropper-actions"> <div class="cropper-actions">
<button <button class="btn btn-secondary" onclick={handleCancel} disabled={isProcessing}> Отмена </button>
class="btn btn-secondary" <button class="btn btn-primary" onclick={handleCrop} disabled={isProcessing}>
onclick={handleCancel}
disabled={isProcessing}
>
Отмена
</button>
<button
class="btn btn-primary"
onclick={handleCrop}
disabled={isProcessing}
>
{isProcessing ? "Обработка..." : "Применить"} {isProcessing ? "Обработка..." : "Применить"}
</button> </button>
</div> </div>
@@ -255,4 +212,55 @@
:global(.cropper-point) { :global(.cropper-point) {
background-color: #007bff; background-color: #007bff;
} }
/* Базовые стили для cropperjs */
:global(.cropper-container) {
direction: ltr;
font-size: 0;
line-height: 0;
position: relative;
touch-action: none;
user-select: none;
}
:global(.cropper-container img) {
display: block;
height: 100%;
image-orientation: 0deg;
max-height: none !important;
max-width: none !important;
min-height: 0 !important;
min-width: 0 !important;
width: 100%;
}
:global(.cropper-wrap-box,
.cropper-canvas,
.cropper-drag-box,
.cropper-crop-box,
.cropper-modal) {
bottom: 0;
left: 0;
position: absolute;
right: 0;
top: 0;
}
:global(.cropper-wrap-box,
.cropper-canvas) {
overflow: hidden;
}
:global(.cropper-drag-box) {
background-color: #fff;
opacity: 0;
}
:global(.cropper-modal) {
background-color: rgba(0, 0, 0, 0.5);
}
:global(.cropper-crop-box) {
border-color: rgba(0, 123, 255, 0.5);
}
</style> </style>
+29 -54
View File
@@ -1,40 +1,25 @@
<script lang="ts"> <script lang="ts">
import { onMount } from "svelte";
import { browser } from "$app/environment";
import { panelStore } from "../stores/panelStore"; import { panelStore } from "../stores/panelStore";
import type { TextItem } from "../lib/types/panel";
import { Stage, Layer, Image, Text } from "svelte-konva";
let { onDownload }: { let {
onDownload,
}: {
onDownload?: () => void; onDownload?: () => void;
} = $props(); } = $props();
let Stage = $state.raw<any>(undefined);
let Layer = $state.raw<any>(undefined);
let KonvaImage = $state.raw<any>(undefined);
let Text = $state.raw<any>(undefined);
let backgroundImage: HTMLImageElement | undefined = $state(undefined); let backgroundImage: HTMLImageElement | undefined = $state(undefined);
$effect(() => { $effect(() => {
if (!browser) return;
const panel = $panelStore; const panel = $panelStore;
if (panel?.backgroundImage && panel.backgroundImage !== backgroundImage?.src) { if (panel?.backgroundImage && panel.backgroundImage !== backgroundImage?.src) {
loadImage(panel.backgroundImage); loadImage(panel.backgroundImage);
} }
}); });
onMount(async () => {
if (browser) {
const svelteKonva = await import("svelte-konva");
Stage = svelteKonva.Stage;
Layer = svelteKonva.Layer;
KonvaImage = svelteKonva.Image;
Text = svelteKonva.Text;
}
});
function loadImage(src: string) { function loadImage(src: string) {
const img = new Image(); const img = document.createElement("img");
img.onload = () => { img.onload = () => {
backgroundImage = img; backgroundImage = img;
}; };
@@ -47,7 +32,7 @@
} }
} }
function getTextPosition(textItem: any) { function getTextPosition(textItem: TextItem) {
const panel = $panelStore; const panel = $panelStore;
if (!panel) return { x: 0, y: 0 }; if (!panel) return { x: 0, y: 0 };
const panelWidth = 320; const panelWidth = 320;
@@ -71,13 +56,11 @@
<div class="preview-header"> <div class="preview-header">
<h2>Предпросмотр панели</h2> <h2>Предпросмотр панели</h2>
{#if $panelStore} {#if $panelStore}
<button class="btn btn-primary" onclick={handleDownload}> <button class="btn btn-primary" onclick={handleDownload}> Скачать </button>
Скачать
</button>
{/if} {/if}
</div> </div>
{#if $panelStore && Stage} {#if $panelStore}
<div class="preview-sections"> <div class="preview-sections">
<!-- Превью чистой картинки --> <!-- Превью чистой картинки -->
<div class="preview-section"> <div class="preview-section">
@@ -86,11 +69,7 @@
<Stage width={320} height={$panelStore.height}> <Stage width={320} height={$panelStore.height}>
<Layer> <Layer>
{#if backgroundImage} {#if backgroundImage}
<KonvaImage <Image image={backgroundImage} width={320} height={$panelStore.height} />
image={backgroundImage}
width={320}
height={$panelStore.height}
/>
{/if} {/if}
</Layer> </Layer>
</Stage> </Stage>
@@ -102,29 +81,25 @@
<h3>С текстом</h3> <h3>С текстом</h3>
<div class="canvas-container"> <div class="canvas-container">
<Stage width={320} height={$panelStore.height}> <Stage width={320} height={$panelStore.height}>
<Layer> <Layer>
{#if backgroundImage} {#if backgroundImage}
<KonvaImage <Image image={backgroundImage} width={320} height={$panelStore.height} />
image={backgroundImage} {/if}
width={320} {#each $panelStore.texts || [] as textItem (textItem.id)}
height={$panelStore.height} {@const textPosition = getTextPosition(textItem)}
/> <Text
{/if} text={textItem.text}
{#each $panelStore.texts || [] as textItem (textItem.id)} fontSize={textItem.fontSize}
{@const textPosition = getTextPosition(textItem)} fill={textItem.color}
<Text fontFamily={textItem.fontFamily}
text={textItem.text} x={textPosition.x}
fontSize={textItem.fontSize} y={textPosition.y}
fill={textItem.color} align={textItem.textAlign}
fontFamily={textItem.fontFamily} width={320 - textItem.paddingX * 2}
x={textPosition.x} />
y={textPosition.y} {/each}
align={textItem.textAlign} </Layer>
width={320 - (textItem.paddingX * 2)} </Stage>
/>
{/each}
</Layer>
</Stage>
</div> </div>
</div> </div>
</div> </div>
+4 -20
View File
@@ -1,8 +1,7 @@
<script lang="ts"> <script lang="ts">
import { onMount } from "svelte";
import { browser } from "$app/environment";
import type { TextItem } from "../lib/types/panel"; import type { TextItem } from "../lib/types/panel";
import { panelStore } from "../stores/panelStore"; import { panelStore } from "../stores/panelStore";
import { Stage, Layer, Image, Text } from "svelte-konva";
let { let {
textItem, textItem,
@@ -12,32 +11,17 @@
height: number; height: number;
} = $props(); } = $props();
let Stage = $state.raw<any>(undefined);
let Layer = $state.raw<any>(undefined);
let KonvaImage = $state.raw<any>(undefined);
let Text = $state.raw<any>(undefined);
let bgImage: HTMLImageElement | undefined = $state(undefined); let bgImage: HTMLImageElement | undefined = $state(undefined);
let currentPanel = $state($panelStore); let currentPanel = $state($panelStore);
onMount(async () => {
if (browser) {
const svelteKonva = await import("svelte-konva");
Stage = svelteKonva.Stage;
Layer = svelteKonva.Layer;
KonvaImage = svelteKonva.Image;
Text = svelteKonva.Text;
}
});
$effect(() => { $effect(() => {
if (!browser) return;
if (currentPanel?.backgroundImage && currentPanel.backgroundImage !== bgImage?.src) { if (currentPanel?.backgroundImage && currentPanel.backgroundImage !== bgImage?.src) {
loadImage(currentPanel.backgroundImage); loadImage(currentPanel.backgroundImage);
} }
}); });
function loadImage(src: string) { function loadImage(src: string) {
const img = new Image(); const img = document.createElement("img");
img.onload = () => { img.onload = () => {
bgImage = img; bgImage = img;
}; };
@@ -66,11 +50,11 @@
</script> </script>
<div class="text-preview"> <div class="text-preview">
{#if Stage && bgImage} {#if bgImage}
<div class="canvas-container"> <div class="canvas-container">
<Stage width={320} {height}> <Stage width={320} {height}>
<Layer> <Layer>
<KonvaImage image={bgImage} width={320} {height} /> <Image image={bgImage} width={320} {height} />
<Text <Text
text={textItem.text} text={textItem.text}
fontSize={textItem.fontSize} fontSize={textItem.fontSize}
+1 -1
View File
@@ -74,7 +74,7 @@ export class ExportService {
*/ */
private loadImage(src: string): Promise<HTMLImageElement> { private loadImage(src: string): Promise<HTMLImageElement> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const img = new Image(); const img = document.createElement("img");
img.onload = () => resolve(img); img.onload = () => resolve(img);
img.onerror = () => reject(new ImageError("Не удалось загрузить изображение")); img.onerror = () => reject(new ImageError("Не удалось загрузить изображение"));
img.src = src; img.src = src;
+1 -1
View File
@@ -66,7 +66,7 @@ export function validateImageElement(img: HTMLImageElement): ValidationResult {
export async function loadImage(src: string): Promise<HTMLImageElement> { export async function loadImage(src: string): Promise<HTMLImageElement> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const img = new Image(); const img = document.createElement("img");
img.crossOrigin = "anonymous"; img.crossOrigin = "anonymous";
img.onload = () => resolve(img); img.onload = () => resolve(img);
+9 -35
View File
@@ -1,28 +1,14 @@
<script lang="ts"> <script lang="ts">
import { onMount } from "svelte";
import { browser } from "$app/environment";
import { panelStore, createEmptyPanel } from "../stores/panelStore"; import { panelStore, createEmptyPanel } from "../stores/panelStore";
import { uiStore, setLoading, setCurrentStep } from "../stores/uiStore"; import { uiStore, setLoading, setCurrentStep } from "../stores/uiStore";
import { exportService } from "../lib/services/exportService"; import { exportService } from "../lib/services/exportService";
import type { Panel } from "../lib/types/panel"; import type { Panel } from "../lib/types/panel";
let ImageUpload: any = $state(undefined); import ImageUpload from "../components/ImageUpload.svelte";
let ImageCropper: any = $state(undefined); import ImageCropper from "../components/ImageCropper.svelte";
let TextManager: any = $state(undefined); import TextManager from "../components/TextManager.svelte";
let PanelPreview: any = $state(undefined); import PanelPreview from "../components/PanelPreview.svelte";
onMount(async () => {
if (browser) {
[ImageUpload, ImageCropper, TextManager, PanelPreview] = await Promise.all([
import("../components/ImageUpload.svelte"),
import("../components/ImageCropper.svelte"),
import("../components/TextManager.svelte"),
import("../components/PanelPreview.svelte")
]);
}
});
let uploadedImage = $state<string | null>(null); let uploadedImage = $state<string | null>(null);
let croppedImage = $state<string | null>(null); let croppedImage = $state<string | null>(null);
@@ -105,29 +91,17 @@
<div class="app-content"> <div class="app-content">
<div class="main-section"> <div class="main-section">
{#if $uiStore.currentStep === "upload"} {#if $uiStore.currentStep === "upload"}
{#if ImageUpload} <ImageUpload onImageSelect={handleImageUpload} />
{@const Upload = ImageUpload.default}
<Upload onImageSelect={handleImageUpload} />
{/if}
{:else if $uiStore.currentStep === "crop" && uploadedImage} {:else if $uiStore.currentStep === "crop" && uploadedImage}
{#if ImageCropper} <ImageCropper imageSrc={uploadedImage} onCropComplete={handleCropComplete} onCancel={handleCropCancel} />
{@const Cropper = ImageCropper.default}
<Cropper imageSrc={uploadedImage} onCropComplete={handleCropComplete} onCancel={handleCropCancel} />
{/if}
{:else if $uiStore.currentStep === "text"} {:else if $uiStore.currentStep === "text"}
{#if TextManager} <TextManager onTextUpdate={handleTextUpdate} />
{@const Manager = TextManager.default}
<Manager onTextUpdate={handleTextUpdate} />
{/if}
{/if} {/if}
</div> </div>
<div class="sidebar"> <div class="sidebar">
{#if $uiStore.currentStep === "text" && PanelPreview?.default} {#if $uiStore.currentStep === "text"}
{@const Preview = PanelPreview.default} <PanelPreview onDownload={handleDownload} />
<Preview onDownload={handleDownload} />
{:else if $uiStore.currentStep === "text"}
<div class="loading">Загрузка предпросмотра...</div>
{/if} {/if}
</div> </div>
</div> </div>