rust/BoxGenerator
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Add logs

Browse Source
This commit is contained in:
Халимов Рустам
2026-01-10 17:23:27 +03:00
parent 3f527ab7e4
commit cf09961807
2 changed files with 119 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/App.tsx
View File

@@ -5,12 +5,50 @@ import { ConfigStep } from './components/ConfigStep';
import { LayoutStep } from './components/LayoutStep';
import { PreviewStep } from './components/PreviewStep';
import { parseShareUrl } from './utils/share';
import { ChevronRight, ChevronLeft, Box } from 'lucide-react';
import { ChevronRight, ChevronLeft, Box, AlertTriangle } from 'lucide-react';
// --- ERROR BOUNDARY (Ловец ошибок) ---
class ErrorBoundary extends React.Component<{children: React.ReactNode}, {hasError: boolean, error: string}> {
constructor(props: any) {
super(props);
this.state = { hasError: false, error: '' };
}
static getDerivedStateFromError(error: any) {
return { hasError: true, error: error.toString() };
}
componentDidCatch(error: any, errorInfo: any) {
console.error("CRITICAL UI ERROR:", error, errorInfo);
}
render() {
if (this.state.hasError) {
return (
<div className="p-8 bg-red-900/50 border border-red-500 rounded-xl text-white m-4">
<h2 className="text-xl font-bold flex items-center gap-2 mb-4">
<AlertTriangle /> Что-то сломалось в этом компоненте
</h2>
<pre className="bg-black/50 p-4 rounded text-xs font-mono overflow-auto">
{this.state.error}
</pre>
<button
onClick={() => window.location.reload()}
className="mt-4 px-4 py-2 bg-red-600 hover:bg-red-500 rounded font-bold"
>
Перезагрузить страницу
</button>
</div>
);
}
return this.props.children;
}
}
const App = () => {
const [step, setStep] = useState(1);
const [isLoadedFromUrl, setIsLoadedFromUrl] = useState(false);
// Инициализация конфига
const [config, setConfig] = useState<AppConfig>({
drawer: { width: 300, depth: 400, height: 80 },
wallThickness: 1.2,
@@ -18,34 +56,44 @@ const App = () => {
cornerRadius: 4,
});
// Инициализация splits с пустой структурой
const [splits, setSplits] = useState<LayoutSplits>({
x: [],
y: [],
partitions: {}
});
// Логируем состояние при каждом изменении
useEffect(() => {
console.log("APP STATE UPDATE:", { step, splits, config });
}, [step, splits, config]);
useEffect(() => {
try {
const sharedData = parseShareUrl();
if (sharedData) {
setConfig(sharedData.config);
// Жесткое приведение типов, чтобы избежать undefined
setSplits({
x: Array.isArray(sharedData.splits.x) ? sharedData.splits.x : [],
y: Array.isArray(sharedData.splits.y) ? sharedData.splits.y : [],
partitions: sharedData.splits.partitions || {}
});
setStep(3);
window.history.replaceState({}, '', window.location.pathname);
}
} catch(e) {
console.error("URL Error", e);
const sharedData = parseShareUrl();
if (sharedData) {
console.log("Loaded from URL:", sharedData);
setConfig(sharedData.config);
setSplits({
x: Array.isArray(sharedData.splits.x) ? sharedData.splits.x : [],
y: Array.isArray(sharedData.splits.y) ? sharedData.splits.y : [],
partitions: sharedData.splits.partitions || {}
});
setStep(3);
setIsLoadedFromUrl(true);
window.history.replaceState({}, '', window.location.pathname);
}
} catch (e) {
console.error("Url Parse Error", e);
}
}, []);
const parts: GeneratedPart[] = useMemo(() => {
return calculateParts(config, splits);
try {
return calculateParts(config, splits);
} catch(e) {
console.error("Geometry Calc Error:", e);
return [];
}
}, [config, splits]);
return (
@@ -61,7 +109,6 @@ const App = () => {
<p className="text-xs text-gray-400">Генератор органайзеров</p>
</div>
</div>
{/* Step Indicator */}
<div className="flex items-center gap-4 text-sm font-medium">
{[1, 2, 3].map((num) => (
<div key={num} className={`flex items-center gap-2 ${step === num ? 'text-primary' : 'text-gray-500'}`}>
@@ -82,8 +129,15 @@ const App = () => {
{step === 2 && (
<div className="h-[calc(100vh-200px)] min-h-[500px] animate-fade-in">
{/* Передаем key для принудительного пересоздания компонента */}
<LayoutStep key="layout-v2" config={config} splits={splits} onChange={setSplits} />
{/* Оборачиваем LayoutStep в ErrorBoundary */}
<ErrorBoundary>
<LayoutStep
key="layout-step-v3" // Force remount
config={config}
splits={splits}
onChange={setSplits}
/>
</ErrorBoundary>
</div>
)}
@@ -97,7 +151,7 @@ const App = () => {
<footer className="bg-slate-900 border-t border-slate-800 p-4 sticky bottom-0 z-50">
<div className="max-w-7xl mx-auto flex justify-between items-center">
<button disabled={step === 1} onClick={() => setStep(s => Math.max(1, s - 1))} className="flex items-center gap-2 px-6 py-3 rounded-lg font-semibold bg-slate-800 text-white disabled:opacity-50 disabled:cursor-not-allowed hover:bg-slate-700 transition-colors"><ChevronLeft size={18} /> Назад</button>
<div className="text-sm text-gray-500">{step === 2 && <span className="text-accent font-mono">Ячеек: {parts.length}</span>}</div>
{step < 3 ? (
<button onClick={() => setStep(s => Math.min(3, s + 1))} className="flex items-center gap-2 px-6 py-3 rounded-lg font-semibold bg-primary text-white hover:bg-blue-600 shadow-lg shadow-blue-900/20 transition-all active:scale-95">Далее <ChevronRight size={18} /></button>
) : (

138
src/components/LayoutStep.tsx
View File

@@ -1,7 +1,6 @@
import React, { useRef, useState, useMemo } from 'react';
import { AppConfig, LayoutSplits, Partition } from '../types';
// ИСПОЛЬЗУЕМ ТОЛЬКО 4 БАЗОВЫЕ ИКОНКИ, ЧТОБЫ ИСКЛЮЧИТЬ ОШИБКИ
import { Grid, Trash2, X, Plus } from 'lucide-react';
import { Grid, MousePointer2, Trash2, RotateCcw, X, Plus } from 'lucide-react';
interface Props {
config: AppConfig;
@@ -13,28 +12,29 @@ type EditMode = 'lines' | 'cells';
type Axis = 'x' | 'y';
export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
// DEBUG LOGGING
console.log("LayoutStep Render. Config:", config, "Splits:", splits);
const svgRef = useRef<SVGSVGElement>(null);
// Режим работы
const [mode, setMode] = useState<EditMode>('lines');
// Состояния
const [phantomAxis, setPhantomAxis] = useState<Axis | null>(null);
const [mousePos, setMousePos] = useState({ x: 0, y: 0 });
const [hoveredSplit, setHoveredSplit] = useState<{ axis: Axis; index: number } | null>(null);
const [dragging, setDragging] = useState<{ axis: Axis; index: number } | null>(null);
const [isButtonHovered, setIsButtonHovered] = useState(false);
// Редактируемая ячейка
const [editingCell, setEditingCell] = useState<{ i: number, j: number } | null>(null);
// --- ЗАЩИТА ДАННЫХ ---
// Если что-то пришло undefined, подменяем на пустые значения
// DATA SAFETY CHECKS
if (!config || !config.drawer) {
console.error("LayoutStep: Config is missing!");
return <div className="text-red-500">Config Error: Missing configuration</div>;
}
const safeX = Array.isArray(splits?.x) ? splits.x : [];
const safeY = Array.isArray(splits?.y) ? splits.y : [];
const safePartitions = splits?.partitions || {};
// Защита от деления на ноль при расчете пропорций
const width = Math.max(1, config.drawer.width || 300);
const depth = Math.max(1, config.drawer.depth || 400);
@@ -42,20 +42,23 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
const aspectRatio = depth / width;
const viewBoxH = viewBoxW * aspectRatio;
// LOG CALCULATIONS
if (isNaN(viewBoxH) || !isFinite(viewBoxH)) {
console.error("LayoutStep: Invalid Dimensions", { width, depth, aspectRatio });
return <div className="text-red-500">Error: Invalid Dimensions ({width}x{depth})</div>;
}
const sortedX = useMemo(() => [0, ...safeX, 1].sort((a, b) => a - b), [safeX]);
const sortedY = useMemo(() => [0, ...safeY, 1].sort((a, b) => a - b), [safeY]);
// --- ЛОГИКА ---
// Handlers
const addPartition = (axis: 'x' | 'y') => {
if (!editingCell) return;
const key = `${editingCell.i}-${editingCell.j}`;
const current = safePartitions[key] || [];
const newPart: Partition = {
id: Math.random().toString(36).substr(2, 9),
axis,
offset: 0.5,
height: config.drawer.height || 80,
rounded: false
axis, offset: 0.5, height: config.drawer.height || 80, rounded: false
};
onChange({ ...splits, partitions: { ...safePartitions, [key]: [...current, newPart] } });
};
@@ -75,7 +78,6 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
onChange({ ...splits, partitions: { ...safePartitions, [key]: current.filter(p => p.id !== id) } });
};
// --- MOUSE HANDLERS ---
const handleGlobalMouseMove = (e: React.MouseEvent) => {
if (!svgRef.current) return;
const rect = svgRef.current.getBoundingClientRect();
@@ -83,7 +85,6 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
const nx = Math.max(0, Math.min(1, (e.clientX - rect.left) / rect.width));
const ny = Math.max(0, Math.min(1, (e.clientY - rect.top) / rect.height));
setMousePos({ x: nx, y: ny });
if (mode === 'lines') {
@@ -96,20 +97,15 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
}
if (isButtonHovered) return;
setHoveredSplit(null);
// Фантомная линия
const SNAP = 0.02;
if (nx > SNAP && nx < 1-SNAP && ny > SNAP && ny < 1-SNAP) {
// Простая проверка, не слишком ли близко к другим линиям
const closeToX = safeX.some(val => Math.abs(nx - val) < SNAP);
const closeToY = safeY.some(val => Math.abs(ny - val) < SNAP);
if (!closeToX && !closeToY) {
const distRight = 1 - nx; const distBottom = 1 - ny;
setPhantomAxis(Math.min(nx, distRight) < Math.min(ny, distBottom) ? 'y' : 'x');
} else {
setPhantomAxis(null);
}
} else { setPhantomAxis(null); }
}
}
};
@@ -142,58 +138,38 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
return (
<div className="bg-slate-900 p-6 rounded-xl shadow-lg border border-slate-800 h-full flex flex-col relative">
{/* HEADER */}
<div className="flex justify-between items-center mb-4 z-20">
<h2 className="text-xl font-bold flex items-center gap-2 text-primary">
<Grid size={24} /> 2. Макет
</h2>
<div className="flex bg-slate-800 p-1 rounded-lg border border-slate-700">
<button onClick={() => { setMode('lines'); setEditingCell(null); }}
className={`px-4 py-2 rounded-md text-xs font-bold ${mode === 'lines' ? 'bg-primary text-white' : 'text-gray-400'}`}>
Границы
</button>
<button onClick={() => setMode('cells')}
className={`px-4 py-2 rounded-md text-xs font-bold ${mode === 'cells' ? 'bg-primary text-white' : 'text-gray-400'}`}>
Внутри ячеек
</button>
<button onClick={() => { setMode('lines'); setEditingCell(null); }} className={`px-4 py-2 rounded-md text-xs font-bold ${mode === 'lines' ? 'bg-primary text-white' : 'text-gray-400'}`}>Границы</button>
<button onClick={() => setMode('cells')} className={`px-4 py-2 rounded-md text-xs font-bold ${mode === 'cells' ? 'bg-primary text-white' : 'text-gray-400'}`}>Ячейки</button>
</div>
{/* Кнопка сброса */}
<button onClick={() => onChange({ x: [], y: [], partitions: {} })} className="text-xs text-red-400 border border-slate-700 px-3 py-1 rounded">
Сброс
</button>
<button onClick={() => onChange({ x: [], y: [], partitions: {} })} className="px-3 py-1 text-xs text-red-400 border border-slate-700 rounded">Сброс</button>
</div>
<div className="flex flex-col h-full select-none relative">
<div className="flex-1 bg-slate-800/30 rounded-lg p-6 flex flex-col items-center justify-center relative overflow-hidden border border-slate-700/50">
{/* DEBUG INFO (Если вдруг снова пусто - увидим это) */}
<div className="absolute top-2 right-2 text-[9px] text-slate-700 font-mono pointer-events-none">
{width}x{depth} | X:{safeX.length} Y:{safeY.length}
<div className="absolute top-4 left-4 z-10 bg-slate-900/90 p-3 rounded-lg backdrop-blur border border-slate-700 shadow-xl max-w-[200px] pointer-events-none">
<div className="flex items-center gap-2 font-bold text-gray-100 mb-2 text-sm">
<MousePointer2 size={14} className="text-primary"/> {mode === 'lines' ? 'Границы' : 'Ячейки'}
</div>
<p className="text-[10px] text-gray-400">{mode === 'lines' ? 'Клик: создать. Драг: двигать.' : 'Кликни по ячейке для настройки.'}</p>
</div>
{/* Rulers */}
<div className="w-full flex justify-between px-8 mb-1 max-w-[900px]">
<span className="text-xs text-slate-500">0</span>
<span className="text-xs text-slate-500">{width} мм</span>
<span className="text-xs text-slate-500">0</span><span className="text-xs text-slate-500">{width} мм</span>
</div>
<div className="relative flex items-center justify-center w-full h-full">
<div className="h-full max-h-[90%] flex flex-col justify-between py-2 mr-2">
<span className="text-xs text-slate-500">0</span>
<span className="text-xs text-slate-500" style={{writingMode: 'vertical-rl'}}>{depth} мм</span>
<span className="text-xs text-slate-500">0</span><span className="text-xs text-slate-500" style={{writingMode: 'vertical-rl'}}>{depth} мм</span>
</div>
{/* SVG */}
<div className="relative shadow-2xl bg-[#1e293b] border border-slate-600 rounded-sm overflow-hidden"
style={{
width: '100%', maxWidth: '900px',
aspectRatio: `${1/aspectRatio}`,
cursor: mode === 'lines' ? 'crosshair' : 'default',
maxHeight: '75vh'
}}
style={{ width: '100%', maxWidth: '900px', aspectRatio: `${1/aspectRatio}`, cursor: mode === 'lines' ? 'crosshair' : 'default', maxHeight: '75vh' }}
>
<svg ref={svgRef} viewBox={`0 0 ${viewBoxW} ${viewBoxH}`} className="w-full h-full touch-none"
onMouseMove={handleGlobalMouseMove} onMouseDown={handleMouseDown} onMouseUp={() => setDragging(null)} onContextMenu={(e) => e.preventDefault()}
@@ -205,14 +181,11 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
</defs>
<rect width="100%" height="100%" fill="url(#grid)" />
{/* CELLS (Рисуем их первыми, чтобы ловить клики) */}
{sortedX.slice(0, -1).map((x1, i) => {
const x2 = sortedX[i + 1];
return sortedY.slice(0, -1).map((y1, j) => {
const cellX = x1 * viewBoxW;
const cellY = y1 * viewBoxH;
const cellW = (x2 - x1) * viewBoxW;
const cellH = (y2 - y1) * viewBoxH;
const cellX = x1 * viewBoxW; const cellY = y1 * viewBoxH;
const cellW = (x2 - x1) * viewBoxW; const cellH = (y2 - y1) * viewBoxH;
const isSelected = editingCell?.i === i && editingCell?.j === j;
const parts = safePartitions[`${i}-${j}`] || [];
@@ -227,10 +200,10 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
{parts.map(p => {
if (p.axis === 'x') {
const px = cellX + (cellW * p.offset);
return <line key={p.id} x1={px} y1={cellY} x2={px} y2={cellY + cellH} stroke="#a855f7" strokeWidth="4" />;
return <line key={p.id} x1={px} y1={cellY} x2={px} y2={cellY + cellH} stroke="#a855f7" strokeWidth="4" className="pointer-events-none"/>;
} else {
const py = cellY + (cellH * p.offset);
return <line key={p.id} x1={cellX} y1={py} x2={cellX + cellW} y2={py} stroke="#a855f7" strokeWidth="4" />;
return <line key={p.id} x1={cellX} y1={py} x2={cellX + cellW} y2={py} stroke="#a855f7" strokeWidth="4" className="pointer-events-none"/>;
}
})}
</g>
@@ -238,7 +211,6 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
});
})}
{/* GRID LINES X */}
{safeX.map((x, i) => (
<g key={`x-${i}`} onMouseMove={(e) => { if (mode === 'lines' && !dragging) { e.stopPropagation(); setHoveredSplit({ axis: 'x', index: i }); setPhantomAxis(null); } }}>
<line x1={x * viewBoxW} y1={0} x2={x * viewBoxW} y2={viewBoxH} stroke="transparent" strokeWidth="60" className={mode === 'lines' ? "cursor-col-resize" : ""} />
@@ -252,7 +224,6 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
</g>
))}
{/* GRID LINES Y */}
{safeY.map((y, i) => (
<g key={`y-${i}`} onMouseMove={(e) => { if (mode === 'lines' && !dragging) { e.stopPropagation(); setHoveredSplit({ axis: 'y', index: i }); setPhantomAxis(null); } }}>
<line x1={0} y1={y * viewBoxH} x2={viewBoxW} y2={y * viewBoxH} stroke="transparent" strokeWidth="60" className={mode === 'lines' ? "cursor-row-resize" : ""} />
@@ -266,63 +237,40 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
</g>
))}
{/* PHANTOM LINES */}
{mode === 'lines' && !hoveredSplit && !dragging && phantomAxis === 'x' && <line x1={mousePos.x * viewBoxW} y1="0" x2={mousePos.x * viewBoxW} y2="100%" stroke="#3b82f6" strokeWidth="4" strokeDasharray="8,8" className="pointer-events-none opacity-50"/>}
{mode === 'lines' && !hoveredSplit && !dragging && phantomAxis === 'y' && <line x1="0" y1={mousePos.y * viewBoxH} x2="100%" y2={mousePos.y * viewBoxH} stroke="#3b82f6" strokeWidth="4" strokeDasharray="8,8" className="pointer-events-none opacity-50"/>}
</svg>
</div>
</div>
{/* --- EDITOR PANEL --- */}
{mode === 'cells' && editingCell && (
<div className="absolute top-0 right-0 bottom-0 w-80 bg-slate-900 border-l border-slate-700 p-4 shadow-2xl flex flex-col z-30">
<div className="flex justify-between items-center mb-6">
<h3 className="text-sm font-bold text-white uppercase tracking-wider">Редактор ячейки</h3>
<button onClick={() => setEditingCell(null)} className="text-gray-400 hover:text-white"><X size={20}/></button>
</div>
<div className="flex gap-2 mb-6">
<button onClick={() => addPartition('x')} className="flex-1 bg-slate-800 hover:bg-slate-700 border border-slate-600 text-white text-xs py-2 px-3 rounded flex items-center justify-center gap-2">
<Plus size={14} className="text-green-400"/> + Верт.
</button>
<button onClick={() => addPartition('y')} className="flex-1 bg-slate-800 hover:bg-slate-700 border border-slate-600 text-white text-xs py-2 px-3 rounded flex items-center justify-center gap-2">
<Plus size={14} className="text-green-400"/> + Гориз.
</button>
<button onClick={() => addPartition('x')} className="flex-1 bg-slate-800 hover:bg-slate-700 border border-slate-600 text-white text-xs py-2 px-3 rounded flex items-center justify-center gap-2"><Plus size={14} className="text-green-400"/> + Верт.</button>
<button onClick={() => addPartition('y')} className="flex-1 bg-slate-800 hover:bg-slate-700 border border-slate-600 text-white text-xs py-2 px-3 rounded flex items-center justify-center gap-2"><Plus size={14} className="text-green-400"/> + Гориз.</button>
</div>
<div className="flex-1 overflow-y-auto space-y-4 pr-1">
{(safePartitions[`${editingCell.i}-${editingCell.j}`] || []).map((p, idx) => (
<div key={p.id} className="bg-slate-800 p-3 rounded border border-slate-700">
<div className="flex justify-between items-center mb-2">
<span className="text-xs font-bold text-purple-300">
Стенка #{idx+1} ({p.axis === 'x' ? 'Верт' : 'Гориз'})
</span>
<span className="text-xs font-bold text-purple-300">Стенка #{idx+1} ({p.axis === 'x' ? 'Верт' : 'Гориз'})</span>
<button onClick={() => removePartition(p.id)} className="text-red-400 hover:text-red-300"><Trash2 size={14}/></button>
</div>
<div className="space-y-3">
<div>
<div className="flex justify-between text-[10px] text-gray-400 mb-1">
<span>Позиция</span> <span>{(p.offset * 100).toFixed(0)}%</span>
</div>
<input type="range" min="0.1" max="0.9" step="0.05" value={p.offset}
onChange={(e) => updatePartition(p.id, { offset: parseFloat(e.target.value) })}
className="w-full h-1 bg-slate-600 rounded-lg appearance-none cursor-pointer accent-purple-500"
/>
<div className="flex justify-between text-[10px] text-gray-400 mb-1"><span>Позиция</span> <span>{(p.offset * 100).toFixed(0)}%</span></div>
<input type="range" min="0.1" max="0.9" step="0.05" value={p.offset} onChange={(e) => updatePartition(p.id, { offset: parseFloat(e.target.value) })} className="w-full h-1 bg-slate-600 rounded-lg appearance-none cursor-pointer accent-purple-500"/>
</div>
<div>
<div className="flex justify-between text-[10px] text-gray-400 mb-1">
<span>Высота</span> <span>{p.height} мм</span>
</div>
<input type="range" min="5" max={config.drawer.height || 100} step="1" value={p.height}
onChange={(e) => updatePartition(p.id, { height: parseFloat(e.target.value) })}
className="w-full h-1 bg-slate-600 rounded-lg appearance-none cursor-pointer accent-blue-500"
/>
<div className="flex justify-between text-[10px] text-gray-400 mb-1"><span>Высота</span> <span>{p.height} мм</span></div>
<input type="range" min="5" max={config.drawer.height || 100} step="1" value={p.height} onChange={(e) => updatePartition(p.id, { height: parseFloat(e.target.value) })} className="w-full h-1 bg-slate-600 rounded-lg appearance-none cursor-pointer accent-blue-500"/>
</div>
<div className="flex items-center gap-2">
<input type="checkbox" id={`rounded-${p.id}`} checked={p.rounded}
onChange={(e) => updatePartition(p.id, { rounded: e.target.checked })}
className="rounded bg-slate-700 border-slate-600 text-purple-500 focus:ring-0"
/>
<input type="checkbox" id={`rounded-${p.id}`} checked={p.rounded} onChange={(e) => updatePartition(p.id, { rounded: e.target.checked })} className="rounded bg-slate-700 border-slate-600 text-purple-500 focus:ring-0"/>
<label htmlFor={`rounded-${p.id}`} className="text-xs text-gray-300">Скругление</label>
</div>
</div>