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

Добавление перегородок в ячейки и их скругления #6

Merged
rust merged 32 commits from test into main 2026-01-10 23:56:10 +03:00
Conversation 0 Commits 32 Files Changed 5
+226 -284
2 changed files with 226 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3f527ab7e4 - Show all commits
src/App.tsx
+13 -58
View File
@@ -9,9 +9,8 @@ import { ChevronRight, ChevronLeft, Box } from 'lucide-react';
const App = () => { const App = () => {
const [step, setStep] = useState(1); const [step, setStep] = useState(1);
const [isLoadedFromUrl, setIsLoadedFromUrl] = useState(false);
// State // Инициализация конфига
const [config, setConfig] = useState<AppConfig>({ const [config, setConfig] = useState<AppConfig>({
drawer: { width: 300, depth: 400, height: 80 }, drawer: { width: 300, depth: 400, height: 80 },
wallThickness: 1.2, wallThickness: 1.2,
@@ -19,7 +18,7 @@ const App = () => {
cornerRadius: 4, cornerRadius: 4,
}); });
// Инициализация с гарантированными пустыми массивами // Инициализация splits с пустой структурой
const [splits, setSplits] = useState<LayoutSplits>({ const [splits, setSplits] = useState<LayoutSplits>({
x: [], x: [],
y: [], y: [],
@@ -31,33 +30,26 @@ const App = () => {
const sharedData = parseShareUrl(); const sharedData = parseShareUrl();
if (sharedData) { if (sharedData) {
setConfig(sharedData.config); setConfig(sharedData.config);
// Жесткое приведение типов, чтобы избежать undefined
setSplits({ setSplits({
x: Array.isArray(sharedData.splits.x) ? sharedData.splits.x : [], x: Array.isArray(sharedData.splits.x) ? sharedData.splits.x : [],
y: Array.isArray(sharedData.splits.y) ? sharedData.splits.y : [], y: Array.isArray(sharedData.splits.y) ? sharedData.splits.y : [],
partitions: sharedData.splits.partitions || {} partitions: sharedData.splits.partitions || {}
}); });
setStep(3); setStep(3);
setIsLoadedFromUrl(true);
window.history.replaceState({}, '', window.location.pathname); window.history.replaceState({}, '', window.location.pathname);
} }
} catch(e) { } catch(e) {
console.error("Ошибка при загрузке URL:", e); console.error("URL Error", e);
} }
}, []); }, []);
// ЗАЩИТА: Оборачиваем расчет геометрии, чтобы не ломать весь UI при ошибке
const parts: GeneratedPart[] = useMemo(() => { const parts: GeneratedPart[] = useMemo(() => {
try {
return calculateParts(config, splits); return calculateParts(config, splits);
} catch (e) {
console.error("Ошибка расчета деталей:", e);
return []; // Возвращаем пустой массив вместо краша
}
}, [config, splits]); }, [config, splits]);
return ( return (
<div className="min-h-screen flex flex-col font-sans text-gray-100 bg-slate-950"> <div className="min-h-screen flex flex-col font-sans text-gray-100 bg-slate-950">
{/* Header */}
<header className="bg-slate-900 border-b border-slate-800 p-4 shadow-md sticky top-0 z-50"> <header className="bg-slate-900 border-b border-slate-800 p-4 shadow-md sticky top-0 z-50">
<div className="max-w-7xl mx-auto flex items-center justify-between"> <div className="max-w-7xl mx-auto flex items-center justify-between">
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
@@ -69,26 +61,18 @@ const App = () => {
<p className="text-xs text-gray-400">Генератор органайзеров</p> <p className="text-xs text-gray-400">Генератор органайзеров</p>
</div> </div>
</div> </div>
{/* Step Indicator */}
<div className="flex items-center gap-4 text-sm font-medium"> <div className="flex items-center gap-4 text-sm font-medium">
{[1, 2, 3].map((num) => ( {[1, 2, 3].map((num) => (
<React.Fragment key={num}> <div key={num} className={`flex items-center gap-2 ${step === num ? 'text-primary' : 'text-gray-500'}`}>
<div className={`flex items-center gap-2 ${step === num ? 'text-primary' : 'text-gray-500'}`}> <span className={`w-6 h-6 rounded-full flex items-center justify-center text-xs border ${step === num ? 'border-primary bg-primary/10' : 'border-gray-600'}`}>{num}</span>
<span className={`w-6 h-6 rounded-full flex items-center justify-center text-xs border ${step === num ? 'border-primary bg-primary/10' : 'border-gray-600'}`}> <span className="hidden md:inline">{num === 1 ? 'Настройки' : num === 2 ? 'Макет' : 'Экспорт'}</span>
{num}
</span>
<span className="hidden md:inline">
{num === 1 ? 'Настройки' : num === 2 ? 'Макет' : 'Экспорт'}
</span>
</div> </div>
{num < 3 && <div className="w-8 h-[1px] bg-slate-700" />}
</React.Fragment>
))} ))}
</div> </div>
</div> </div>
</header> </header>
{/* Main Content */}
<main className="flex-1 max-w-7xl mx-auto w-full p-4 md:p-8"> <main className="flex-1 max-w-7xl mx-auto w-full p-4 md:p-8">
{step === 1 && ( {step === 1 && (
<div className="max-w-4xl mx-auto animate-fade-in"> <div className="max-w-4xl mx-auto animate-fade-in">
@@ -98,12 +82,8 @@ const App = () => {
{step === 2 && ( {step === 2 && (
<div className="h-[calc(100vh-200px)] min-h-[500px] animate-fade-in"> <div className="h-[calc(100vh-200px)] min-h-[500px] animate-fade-in">
{/* Добавляем проверку на существование данных */} {/* Передаем key для принудительного пересоздания компонента */}
<LayoutStep <LayoutStep key="layout-v2" config={config} splits={splits} onChange={setSplits} />
config={config}
splits={splits}
onChange={setSplits}
/>
</div> </div>
)} )}
@@ -114,39 +94,14 @@ const App = () => {
)} )}
</main> </main>
{/* Footer */}
<footer className="bg-slate-900 border-t border-slate-800 p-4 sticky bottom-0 z-50"> <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"> <div className="max-w-7xl mx-auto flex justify-between items-center">
<button <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>
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 ? ( {step < 3 ? (
<button <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>
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>
) : ( ) : (
<button <button onClick={() => { setStep(1); setSplits({x: [], y: [], partitions: {}}); window.history.replaceState({}, '', window.location.pathname); }} className="flex items-center gap-2 px-6 py-3 rounded-lg font-semibold text-gray-400 hover:text-white transition-colors border border-transparent hover:border-slate-700">Новый проект</button>
onClick={() => {
setStep(1);
setSplits({x: [], y: [], partitions: {}});
window.history.replaceState({}, '', window.location.pathname);
}}
className="flex items-center gap-2 px-6 py-3 rounded-lg font-semibold text-gray-400 hover:text-white transition-colors border border-transparent hover:border-slate-700"
>
Новый проект
</button>
)} )}
</div> </div>
</footer> </footer>
src/components/LayoutStep.tsx
+65 -78
View File
@@ -1,7 +1,7 @@
import React, { useRef, useState, useMemo } from 'react'; import React, { useRef, useState, useMemo } from 'react';
import { AppConfig, LayoutSplits, Partition } from '../types'; import { AppConfig, LayoutSplits, Partition } from '../types';
// ИСПОЛЬЗУЕМ ТОЛЬКО БАЗОВЫЕ ИКОНКИ (чтобы не крашилось из-за версий) // ИСПОЛЬЗУЕМ ТОЛЬКО 4 БАЗОВЫЕ ИКОНКИ, ЧТОБЫ ИСКЛЮЧИТЬ ОШИБКИ
import { Grid, MousePointer2, Trash2, RotateCcw, X, Plus, Check } from 'lucide-react'; import { Grid, Trash2, X, Plus } from 'lucide-react';
interface Props { interface Props {
config: AppConfig; config: AppConfig;
@@ -15,26 +15,29 @@ type Axis = 'x' | 'y';
export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => { export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
const svgRef = useRef<SVGSVGElement>(null); const svgRef = useRef<SVGSVGElement>(null);
// Режим работы
const [mode, setMode] = useState<EditMode>('lines'); const [mode, setMode] = useState<EditMode>('lines');
// SVG State // Состояния
const [phantomAxis, setPhantomAxis] = useState<Axis | null>(null); const [phantomAxis, setPhantomAxis] = useState<Axis | null>(null);
const [mousePos, setMousePos] = useState({ x: 0, y: 0 }); const [mousePos, setMousePos] = useState({ x: 0, y: 0 });
const [hoveredSplit, setHoveredSplit] = useState<{ axis: Axis; index: number } | null>(null); const [hoveredSplit, setHoveredSplit] = useState<{ axis: Axis; index: number } | null>(null);
const [dragging, setDragging] = useState<{ axis: Axis; index: number } | null>(null); const [dragging, setDragging] = useState<{ axis: Axis; index: number } | null>(null);
const [isButtonHovered, setIsButtonHovered] = useState(false); const [isButtonHovered, setIsButtonHovered] = useState(false);
// Editor State // Редактируемая ячейка
const [editingCell, setEditingCell] = useState<{ i: number, j: number } | null>(null); const [editingCell, setEditingCell] = useState<{ i: number, j: number } | null>(null);
// --- ЗАЩИТА ДАННЫХ (ОТ БЕЛОГО ЭКРАНА) --- // --- ЗАЩИТА ДАННЫХ ---
// Если что-то пришло undefined, подменяем на пустые значения
const safeX = Array.isArray(splits?.x) ? splits.x : []; const safeX = Array.isArray(splits?.x) ? splits.x : [];
const safeY = Array.isArray(splits?.y) ? splits.y : []; const safeY = Array.isArray(splits?.y) ? splits.y : [];
const safePartitions = splits?.partitions || {}; const safePartitions = splits?.partitions || {};
// Расчет размеров SVG с защитой от деления на ноль // Защита от деления на ноль при расчете пропорций
const width = Math.max(1, config.drawer.width || 100); const width = Math.max(1, config.drawer.width || 300);
const depth = Math.max(1, config.drawer.depth || 100); const depth = Math.max(1, config.drawer.depth || 400);
const viewBoxW = 1000; const viewBoxW = 1000;
const aspectRatio = depth / width; const aspectRatio = depth / width;
const viewBoxH = viewBoxW * aspectRatio; const viewBoxH = viewBoxW * aspectRatio;
@@ -42,7 +45,7 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
const sortedX = useMemo(() => [0, ...safeX, 1].sort((a, b) => a - b), [safeX]); const sortedX = useMemo(() => [0, ...safeX, 1].sort((a, b) => a - b), [safeX]);
const sortedY = useMemo(() => [0, ...safeY, 1].sort((a, b) => a - b), [safeY]); const sortedY = useMemo(() => [0, ...safeY, 1].sort((a, b) => a - b), [safeY]);
// --- ЛОГИКА ПЕРЕГОРОДОК --- // --- ЛОГИКА ---
const addPartition = (axis: 'x' | 'y') => { const addPartition = (axis: 'x' | 'y') => {
if (!editingCell) return; if (!editingCell) return;
const key = `${editingCell.i}-${editingCell.j}`; const key = `${editingCell.i}-${editingCell.j}`;
@@ -51,14 +54,10 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
id: Math.random().toString(36).substr(2, 9), id: Math.random().toString(36).substr(2, 9),
axis, axis,
offset: 0.5, offset: 0.5,
height: config.drawer.height, height: config.drawer.height || 80,
rounded: false rounded: false
}; };
onChange({ ...splits, partitions: { ...safePartitions, [key]: [...current, newPart] } });
onChange({
...splits,
partitions: { ...safePartitions, [key]: [...current, newPart] }
});
}; };
const updatePartition = (id: string, updates: Partial<Partition>) => { const updatePartition = (id: string, updates: Partial<Partition>) => {
@@ -66,28 +65,21 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
const key = `${editingCell.i}-${editingCell.j}`; const key = `${editingCell.i}-${editingCell.j}`;
const current = safePartitions[key] || []; const current = safePartitions[key] || [];
const updated = current.map(p => p.id === id ? { ...p, ...updates } : p); const updated = current.map(p => p.id === id ? { ...p, ...updates } : p);
onChange({ ...splits, partitions: { ...safePartitions, [key]: updated } });
onChange({
...splits,
partitions: { ...safePartitions, [key]: updated }
});
}; };
const removePartition = (id: string) => { const removePartition = (id: string) => {
if (!editingCell) return; if (!editingCell) return;
const key = `${editingCell.i}-${editingCell.j}`; const key = `${editingCell.i}-${editingCell.j}`;
const current = safePartitions[key] || []; const current = safePartitions[key] || [];
onChange({ onChange({ ...splits, partitions: { ...safePartitions, [key]: current.filter(p => p.id !== id) } });
...splits,
partitions: { ...safePartitions, [key]: current.filter(p => p.id !== id) }
});
}; };
// --- UI HANDLERS --- // --- MOUSE HANDLERS ---
const handleGlobalMouseMove = (e: React.MouseEvent) => { const handleGlobalMouseMove = (e: React.MouseEvent) => {
if (!svgRef.current) return; if (!svgRef.current) return;
const rect = svgRef.current.getBoundingClientRect(); const rect = svgRef.current.getBoundingClientRect();
if (rect.width === 0 || rect.height === 0) return; // Защита if (rect.width === 0) return;
const nx = Math.max(0, Math.min(1, (e.clientX - rect.left) / rect.width)); 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)); const ny = Math.max(0, Math.min(1, (e.clientY - rect.top) / rect.height));
@@ -102,22 +94,24 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
onChange(newSplits); onChange(newSplits);
return; return;
} }
if (isButtonHovered) return; if (isButtonHovered) return;
setHoveredSplit(null); setHoveredSplit(null);
// Фантомная линия // Фантомная линия
const SNAP = 0.02; 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 closeToX = safeX.some(val => Math.abs(nx - val) < SNAP);
const closeToY = safeY.some(val => Math.abs(ny - val) < SNAP); const closeToY = safeY.some(val => Math.abs(ny - val) < SNAP);
if (!closeToX && !closeToY && nx > SNAP && nx < 1-SNAP && ny > SNAP && ny < 1-SNAP) { if (!closeToX && !closeToY) {
const distRight = 1 - nx; const distBottom = 1 - ny; const distRight = 1 - nx; const distBottom = 1 - ny;
setPhantomAxis(Math.min(nx, distRight) < Math.min(ny, distBottom) ? 'y' : 'x'); setPhantomAxis(Math.min(nx, distRight) < Math.min(ny, distBottom) ? 'y' : 'x');
} else { } else {
setPhantomAxis(null); setPhantomAxis(null);
} }
} }
}
}; };
const handleMouseDown = (e: React.MouseEvent) => { const handleMouseDown = (e: React.MouseEvent) => {
@@ -133,7 +127,6 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
setDragging({ axis: phantomAxis, index: newSplits[phantomAxis].length - 1 }); setDragging({ axis: phantomAxis, index: newSplits[phantomAxis].length - 1 });
} }
} else { } else {
// Режим ячеек: клик обрабатывается на самих rect'ах, здесь только сброс
if (e.target === svgRef.current) setEditingCell(null); if (e.target === svgRef.current) setEditingCell(null);
} }
}; };
@@ -153,43 +146,52 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
{/* HEADER */} {/* HEADER */}
<div className="flex justify-between items-center mb-4 z-20"> <div className="flex justify-between items-center mb-4 z-20">
<h2 className="text-xl font-bold flex items-center gap-2 text-primary"> <h2 className="text-xl font-bold flex items-center gap-2 text-primary">
<Grid size={24} /> 2. Редактор <Grid size={24} /> 2. Макет
</h2> </h2>
<div className="flex bg-slate-800 p-1 rounded-lg border border-slate-700"> <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 transition-all ${mode === 'lines' ? 'bg-primary text-white shadow' : 'text-gray-400 hover:text-gray-200'}`}> <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>
<button onClick={() => setMode('cells')} className={`px-4 py-2 rounded-md text-xs font-bold transition-all ${mode === 'cells' ? 'bg-primary text-white shadow' : 'text-gray-400 hover:text-gray-200'}`}> <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>
</div> </div>
<button onClick={() => onChange({ x: [], y: [], partitions: {} })} className="px-3 py-1 text-xs bg-slate-800 text-red-400 hover:text-red-300 rounded border border-slate-700 flex items-center gap-1"> {/* Кнопка сброса */}
<RotateCcw size={14} /> Сброс <button onClick={() => onChange({ x: [], y: [], partitions: {} })} className="text-xs text-red-400 border border-slate-700 px-3 py-1 rounded">
Сброс
</button> </button>
</div> </div>
<div className="flex flex-col h-full select-none relative"> <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"> <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">
{/* Instruction Overlay */} {/* DEBUG INFO (Если вдруг снова пусто - увидим это) */}
<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="absolute top-2 right-2 text-[9px] text-slate-700 font-mono pointer-events-none">
<div className="flex items-center gap-2 font-bold text-gray-100 mb-2 text-sm"> {width}x{depth} | X:{safeX.length} Y:{safeY.length}
<MousePointer2 size={14} className="text-primary"/>
{mode === 'lines' ? 'Режим: Границы' : 'Режим: Ячейки'}
</div>
<p className="text-[10px] text-gray-400">
{mode === 'lines' ? 'Клик: создать. Драг: двигать. ПКМ: удалить.' : 'Кликни по ячейке, чтобы добавить стенки внутри.'}
</p>
</div> </div>
{/* Canvas Container */} {/* Rulers */}
<div className="relative shadow-2xl bg-[#1e293b] border border-slate-600 rounded-sm overflow-hidden group" <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>
</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>
</div>
{/* SVG */}
<div className="relative shadow-2xl bg-[#1e293b] border border-slate-600 rounded-sm overflow-hidden"
style={{ style={{
width: '100%', maxWidth: '900px', width: '100%', maxWidth: '900px',
aspectRatio: `${1/aspectRatio}`, aspectRatio: `${1/aspectRatio}`,
cursor: mode === 'lines' ? (dragging ? 'grabbing' : hoveredSplit ? 'grab' : 'crosshair') : 'default', cursor: mode === 'lines' ? 'crosshair' : 'default',
maxHeight: '75vh' maxHeight: '75vh'
}} }}
> >
@@ -203,7 +205,7 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
</defs> </defs>
<rect width="100%" height="100%" fill="url(#grid)" /> <rect width="100%" height="100%" fill="url(#grid)" />
{/* Ячейки и перегородки */} {/* CELLS (Рисуем их первыми, чтобы ловить клики) */}
{sortedX.slice(0, -1).map((x1, i) => { {sortedX.slice(0, -1).map((x1, i) => {
const x2 = sortedX[i + 1]; const x2 = sortedX[i + 1];
return sortedY.slice(0, -1).map((y1, j) => { return sortedY.slice(0, -1).map((y1, j) => {
@@ -216,21 +218,19 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
return ( return (
<g key={`cell-${i}-${j}`}> <g key={`cell-${i}-${j}`}>
{/* Прямоугольник для клика */}
<rect x={cellX} y={cellY} width={cellW} height={cellH} <rect x={cellX} y={cellY} width={cellW} height={cellH}
fill={isSelected ? "rgba(59, 130, 246, 0.2)" : "transparent"} fill={isSelected ? "rgba(59, 130, 246, 0.2)" : "transparent"}
stroke={isSelected ? "#3b82f6" : "transparent"} strokeWidth="4" stroke={isSelected ? "#3b82f6" : "transparent"} strokeWidth="4"
className={mode === 'cells' ? "cursor-pointer hover:fill-white/5 transition-all" : ""} className={mode === 'cells' ? "cursor-pointer hover:fill-white/5" : ""}
onClick={(e) => { if (mode === 'cells') { e.stopPropagation(); setEditingCell({ i, j }); } }} onClick={(e) => { if (mode === 'cells') { e.stopPropagation(); setEditingCell({ i, j }); } }}
/> />
{/* Перегородки */}
{parts.map(p => { {parts.map(p => {
if (p.axis === 'x') { if (p.axis === 'x') {
const px = cellX + (cellW * p.offset); const px = cellX + (cellW * p.offset);
return <line key={p.id} x1={px} y1={cellY} x2={px} y2={cellY + cellH} stroke="#a855f7" strokeWidth="4" className="pointer-events-none"/>; return <line key={p.id} x1={px} y1={cellY} x2={px} y2={cellY + cellH} stroke="#a855f7" strokeWidth="4" />;
} else { } else {
const py = cellY + (cellH * p.offset); const py = cellY + (cellH * p.offset);
return <line key={p.id} x1={cellX} y1={py} x2={cellX + cellW} y2={py} stroke="#a855f7" strokeWidth="4" className="pointer-events-none"/>; return <line key={p.id} x1={cellX} y1={py} x2={cellX + cellW} y2={py} stroke="#a855f7" strokeWidth="4" />;
} }
})} })}
</g> </g>
@@ -238,7 +238,7 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
}); });
})} })}
{/* Линии сетки (X) */} {/* GRID LINES X */}
{safeX.map((x, i) => ( {safeX.map((x, i) => (
<g key={`x-${i}`} onMouseMove={(e) => { if (mode === 'lines' && !dragging) { e.stopPropagation(); setHoveredSplit({ axis: 'x', index: i }); setPhantomAxis(null); } }}> <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" : ""} /> <line x1={x * viewBoxW} y1={0} x2={x * viewBoxW} y2={viewBoxH} stroke="transparent" strokeWidth="60" className={mode === 'lines' ? "cursor-col-resize" : ""} />
@@ -252,7 +252,7 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
</g> </g>
))} ))}
{/* Линии сетки (Y) */} {/* GRID LINES Y */}
{safeY.map((y, i) => ( {safeY.map((y, i) => (
<g key={`y-${i}`} onMouseMove={(e) => { if (mode === 'lines' && !dragging) { e.stopPropagation(); setHoveredSplit({ axis: 'y', index: i }); setPhantomAxis(null); } }}> <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" : ""} /> <line x1={0} y1={y * viewBoxH} x2={viewBoxW} y2={y * viewBoxH} stroke="transparent" strokeWidth="60" className={mode === 'lines' ? "cursor-row-resize" : ""} />
@@ -266,42 +266,39 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
</g> </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 === '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"/>} {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> </svg>
</div> </div>
</div> </div>
{/* --- ПАНЕЛЬ РЕДАКТОРА (Справа) --- */} {/* --- EDITOR PANEL --- */}
{mode === 'cells' && editingCell && ( {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="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"> <div className="flex justify-between items-center mb-6">
<h3 className="text-lg font-bold text-white flex items-center gap-2"> <h3 className="text-sm font-bold text-white uppercase tracking-wider">Редактор ячейки</h3>
<Grid size={18} className="text-primary"/> Редактор ячейки
</h3>
<button onClick={() => setEditingCell(null)} className="text-gray-400 hover:text-white"><X size={20}/></button> <button onClick={() => setEditingCell(null)} className="text-gray-400 hover:text-white"><X size={20}/></button>
</div> </div>
<div className="flex gap-2 mb-6"> <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 transition-colors"> <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"/> + Верт. <Plus size={14} className="text-green-400"/> + Верт.
</button> </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 transition-colors"> <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"/> + Гориз. <Plus size={14} className="text-green-400"/> + Гориз.
</button> </button>
</div> </div>
<div className="flex-1 overflow-y-auto space-y-4 pr-1"> <div className="flex-1 overflow-y-auto space-y-4 pr-1">
{(safePartitions[`${editingCell.i}-${editingCell.j}`] || []).map((p, idx) => ( {(safePartitions[`${editingCell.i}-${editingCell.j}`] || []).map((p, idx) => (
<div key={p.id} className="bg-slate-800 p-3 rounded border border-slate-700 group"> <div key={p.id} className="bg-slate-800 p-3 rounded border border-slate-700">
<div className="flex justify-between items-center mb-2"> <div className="flex justify-between items-center mb-2">
<span className="text-xs font-bold text-purple-300"> <span className="text-xs font-bold text-purple-300">
#{idx+1} {p.axis === 'x' ? 'Вертикальная' : 'Горизонтальная'} Стенка #{idx+1} ({p.axis === 'x' ? 'Верт' : 'Гориз'})
</span> </span>
<button onClick={() => removePartition(p.id)} className="text-red-400 opacity-50 hover:opacity-100"><Trash2 size={14}/></button> <button onClick={() => removePartition(p.id)} className="text-red-400 hover:text-red-300"><Trash2 size={14}/></button>
</div> </div>
<div className="space-y-3"> <div className="space-y-3">
<div> <div>
<div className="flex justify-between text-[10px] text-gray-400 mb-1"> <div className="flex justify-between text-[10px] text-gray-400 mb-1">
@@ -312,39 +309,29 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
className="w-full h-1 bg-slate-600 rounded-lg appearance-none cursor-pointer accent-purple-500" className="w-full h-1 bg-slate-600 rounded-lg appearance-none cursor-pointer accent-purple-500"
/> />
</div> </div>
<div> <div>
<div className="flex justify-between text-[10px] text-gray-400 mb-1"> <div className="flex justify-between text-[10px] text-gray-400 mb-1">
<span>Высота</span> <span>{p.height} мм</span> <span>Высота</span> <span>{p.height} мм</span>
</div> </div>
<input type="range" min="5" max={config.drawer.height} step="1" value={p.height} <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) })} 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" className="w-full h-1 bg-slate-600 rounded-lg appearance-none cursor-pointer accent-blue-500"
/> />
</div> </div>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<input type="checkbox" id={`rounded-${p.id}`} checked={p.rounded} <input type="checkbox" id={`rounded-${p.id}`} checked={p.rounded}
onChange={(e) => updatePartition(p.id, { rounded: e.target.checked })} onChange={(e) => updatePartition(p.id, { rounded: e.target.checked })}
className="rounded bg-slate-700 border-slate-600 text-purple-500 focus:ring-0" 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 cursor-pointer select-none">Скругление краев</label> <label htmlFor={`rounded-${p.id}`} className="text-xs text-gray-300">Скругление</label>
</div> </div>
</div> </div>
</div> </div>
))} ))}
{(safePartitions[`${editingCell.i}-${editingCell.j}`] || []).length === 0 && ( </div>
<div className="text-center text-gray-500 text-xs py-4 border border-dashed border-slate-700 rounded">
Нет перегородок
</div> </div>
)} )}
</div> </div>
<button onClick={() => setEditingCell(null)} className="mt-4 w-full bg-primary hover:bg-blue-600 text-white py-2 rounded text-sm font-bold flex items-center justify-center gap-2">
<Check size={16}/> Готово
</button>
</div>
)}
</div> </div>
</div> </div>
); );