Merge pull request 'Корректная расстановка стенок' (#7) from test into main

Reviewed-on: #7
2026-01-11 15:58:40 +03:00
parent 6990f18c78 33a5b8d44d
commit 6daa10746b
2 changed files with 205 additions and 278 deletions
--- a/src/components/LayoutStep.tsx
+++ b/src/components/LayoutStep.tsx
@@ -1,7 +1,6 @@
 import React, { useRef, useState, useMemo } from 'react';
 import { AppConfig, LayoutSplits, Partition } from '../types';
-// Добавил Settings, Move и прочее в импорты
-import { Grid, MousePointer2, Trash2, RotateCcw, X, Move, Settings, Plus } from 'lucide-react';
+import { Grid, MousePointer2, Trash2, RotateCcw, X, Move, Settings2 } from 'lucide-react';

 interface Props {
  config: AppConfig;
@@ -25,23 +24,22 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
  const [dragging, setDragging] = useState<DragTarget | null>(null);
  const [isButtonHovered, setIsButtonHovered] = useState(false);

-  // Main Grid Hover
  const [phantomMainAxis, setPhantomMainAxis] = useState<Axis | null>(null);
  const [hoveredMainSplit, setHoveredMainSplit] = useState<{ axis: Axis; index: number } | null>(null);

-  // Partition Hover
  const [hoveredCell, setHoveredCell] = useState<{ i: number; j: number } | null>(null);
  const [hoveredPartition, setHoveredPartition] = useState<{ id: string; cellKey: string } | null>(null);
  const [phantomPartition, setPhantomPartition] = useState<{ axis: Axis; offset: number; min: number; max: number } | null>(null);
  const [selectedPartitionId, setSelectedPartitionId] = useState<string | null>(null);

-  // -- SAFE DATA --
+  // -- DATA --
  const safeX = Array.isArray(splits?.x) ? splits.x : [];
  const safeY = Array.isArray(splits?.y) ? splits.y : [];
  const safePartitions = splits?.partitions || {};

  const drawerW = Math.max(1, config.drawer.width || 300);
  const drawerD = Math.max(1, config.drawer.depth || 400);
+  const wallThick = config.wallThickness || 1.2;
  const aspectRatio = drawerD / drawerW;

  const viewBoxW = 1000;
@@ -61,27 +59,29 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
  };
  const selectedData = getSelectedPartition();

-  // -- LOGIC: T-Junction Limits --
-  // Находит ближайшие стенки, чтобы ограничить новую перегородку
-  const getHoveredBoundaries = (lx: number, ly: number, parts: Partition[]) => {
+  // --- RAYCASTING (Надежный поиск коробки) ---
+  // Находит ближайшие стенки во всех 4 направлениях
+  const getCursorBox = (lx: number, ly: number, parts: Partition[]) => {
      let minX = 0, maxX = 1;
      let minY = 0, maxY = 1;

      parts.forEach(p => {
+          // Используем сохраненные границы (они теперь достоверны)
          const pMin = p.min ?? 0;
          const pMax = p.max ?? 1;
+          const EPS = 0.005; // Допуск на попадание

          if (p.axis === 'x') {
-              // Вертикальная стенка (x=offset, y=min..max)
-              // Проверяем, находится ли мышь в её диапазоне по Y
-              if (ly >= pMin && ly <= pMax) {
+              // Вертикальная стенка. Перекрывает ли она наш Y?
+              if (ly >= pMin - EPS && ly <= pMax + EPS) {
+                  // Стенка на нашем уровне. Слева или справа?
                  if (p.offset < lx) minX = Math.max(minX, p.offset);
                  if (p.offset > lx) maxX = Math.min(maxX, p.offset);
              }
          } else {
-              // Горизонтальная стенка (y=offset, x=min..max)
-              // Проверяем, находится ли мышь в её диапазоне по X
-              if (lx >= pMin && lx <= pMax) {
+              // Горизонтальная стенка. Перекрывает ли она наш X?
+              if (lx >= pMin - EPS && lx <= pMax + EPS) {
+                  // Стенка на нашем уровне. Сверху или снизу?
                  if (p.offset < ly) minY = Math.max(minY, p.offset);
                  if (p.offset > ly) maxY = Math.min(maxY, p.offset);
              }
@@ -90,20 +90,34 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
      return { minX, maxX, minY, maxY };
  };

+  // Поиск соседей для размеров (Та же логика, что Raycasting)
+  const getNeighborOffsets = (offset: number, crossPos: number, axis: Axis, parts: Partition[]) => {
+      let min = 0;
+      let max = 1;
+      const EPS = 0.005;
+
+      parts.forEach(p => {
+          if (p.axis === axis) { 
+              const pMin = p.min ?? 0;
+              const pMax = p.max ?? 1;
+              if (crossPos >= pMin - EPS && crossPos <= pMax + EPS) {
+                  if (p.offset < offset) min = Math.max(min, p.offset);
+                  if (p.offset > offset) max = Math.min(max, p.offset);
+              }
+          }
+      });
+      return { min, max };
+  };
+
  // -- ACTIONS --
  const createPartition = (i: number, j: number, axis: Axis, offset: number, min: number, max: number) => {
    const key = `${i}-${j}`;
    const current = safePartitions[key] || [];
    const newPart: Partition = {
      id: Math.random().toString(36).substr(2, 9),
-      axis,
-      offset,
-      min, 
-      max,
-      height: config.drawer.height || 80,
-      rounded: false
+      axis, offset, min, max,
+      height: config.drawer.height || 80, rounded: false
    };
-    // Обновляем стейт, но НЕ сбрасываем mode, так как ErrorBoundary теперь снаружи
    onChange({ ...splits, partitions: { ...safePartitions, [key]: [...current, newPart] } });
    setSelectedPartitionId(newPart.id);
  };
@@ -129,12 +143,11 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
    setDragging(null);
  };

-  // -- MOUSE HANDLER --
+  // -- MOUSE HANDLERS --
  const handleMouseMove = (e: React.MouseEvent) => {
    if (!svgRef.current) return;
    const rect = svgRef.current.getBoundingClientRect();
    if (rect.width === 0) return;
-
    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 });
@@ -152,19 +165,11 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
        const cellY1 = sortedY[j]; const cellY2 = sortedY[j+1];
        
        let newOffset = 0;
-        if (dragging.axis === 'x') {
-          newOffset = (nx - cellX1) / (cellX2 - cellX1);
-        } else {
-          newOffset = (ny - cellY1) / (cellY2 - cellY1);
-        }
+        if (dragging.axis === 'x') newOffset = (nx - cellX1) / (cellX2 - cellX1);
+        else newOffset = (ny - cellY1) / (cellY2 - cellY1);
        
-        // Ограничиваем в пределах "родительской" зоны (0-1) внутри ячейки
-        // В идеале тут тоже надо проверять коллизии, но пока просто границы ячейки
        newOffset = Math.max(0.02, Math.min(0.98, newOffset));
-        
-        if (!isNaN(newOffset)) {
-          updatePartition(dragging.cellKey, dragging.id, { offset: newOffset });
-        }
+        if (!isNaN(newOffset)) updatePartition(dragging.cellKey, dragging.id, { offset: newOffset });
      }
      return;
    }
@@ -177,25 +182,21 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
      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;
-          setPhantomMainAxis(Math.min(nx, distRight) < Math.min(ny, distBottom) ? 'y' : 'x');
-        } else { setPhantomMainAxis(null); }
+        if (!closeToX && !closeToY) setPhantomMainAxis(Math.min(nx, 1-nx) < Math.min(ny, 1-ny) ? 'y' : 'x');
+        else setPhantomMainAxis(null);
      }
    } else {
-      // Cells Mode
      setHoveredPartition(null);
      setPhantomPartition(null);
      setHoveredCell(null);

-      // 1. Находим ячейку
+      // Find Cell
      let cellIdx = null;
      for (let i = 0; i < sortedX.length - 1; i++) {
        if (nx >= sortedX[i] && nx <= sortedX[i+1]) {
          for (let j = 0; j < sortedY.length - 1; j++) {
            if (ny >= sortedY[j] && ny <= sortedY[j+1]) {
-              cellIdx = { i, j };
-              break;
+              cellIdx = { i, j }; break;
            }
          }
        }
@@ -212,11 +213,15 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
        const lx = (nx - cx1) / cw;
        const ly = (ny - cy1) / ch;

-        // 2. Проверяем наведение на существующие (для удаления/выделения)
+        // Use real mm for aspect ratio logic
+        const realCellW = cw * drawerW;
+        const realCellH = ch * drawerD;
+
        let found = null;
        const SNAP = 0.05;
        for (const p of parts) {
-          const pMin = p.min ?? 0; const pMax = p.max ?? 1;
+          const pMin = p.min ?? 0;
+          const pMax = p.max ?? 1;
          if (p.axis === 'x') {
            if (ly >= pMin && ly <= pMax && Math.abs(lx - p.offset) < SNAP * (aspectRatio > 1 ? 1 : aspectRatio)) found = p;
          } else {
@@ -227,29 +232,30 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
        if (found) {
          setHoveredPartition({ id: found.id, cellKey: key });
        } else {
-          // 3. Вычисляем T-образные границы
-          const bounds = getHoveredBoundaries(lx, ly, parts);
+          // --- FIND BOX ---
+          const box = getCursorBox(lx, ly, parts);
          
-          const distL = lx - bounds.minX; 
-          const distR = bounds.maxX - lx;
-          const distT = ly - bounds.minY; 
-          const distB = bounds.maxY - ly;
+          const boxW = (box.maxX - box.minX) * realCellW;
+          const boxH = (box.maxY - box.minY) * realCellH;
+
+          // Default axis based on longest side
+          let newAxis: Axis = boxW > boxH ? 'x' : 'y';
+
+          // Override if near edges
+          const relL = (lx - box.minX) / (box.maxX - box.minX);
+          const relT = (ly - box.minY) / (box.maxY - box.minY);
+          const THRESHOLD = 0.2;
+
+          if (relL < THRESHOLD || relL > 1 - THRESHOLD) newAxis = 'x'; // Near vertical edge -> vertical wall
+          else if (relT < THRESHOLD || relT > 1 - THRESHOLD) newAxis = 'y'; // Near horiz edge -> horizontal wall
+
+          const valid = (newAxis === 'x' && (box.maxX - box.minX) > 0.05) || (newAxis === 'y' && (box.maxY - box.minY) > 0.05);
          
-          const minX = Math.min(distL, distR);
-          const minY = Math.min(distT, distB);
-          
-          // Определяем ось перпендикулярно ближайшей стороне
-          const axis = minX < minY ? 'y' : 'x'; 
-          
-          // Проверяем, есть ли место
-          const width = bounds.maxX - bounds.minX;
-          const height = bounds.maxY - bounds.minY;
-          
-          if ((axis === 'y' && height > 0.1) || (axis === 'x' && width > 0.1)) {
-             const offset = axis === 'x' ? lx : ly;
-             const min = axis === 'x' ? bounds.minY : bounds.minX;
-             const max = axis === 'x' ? bounds.maxY : bounds.maxX;
-             setPhantomPartition({ axis, offset, min, max });
+          if (valid) {
+             const offset = newAxis === 'x' ? lx : ly;
+             const min = newAxis === 'x' ? box.minY : box.minX;
+             const max = newAxis === 'x' ? box.maxY : box.maxX;
+             setPhantomPartition({ axis: newAxis, offset, min, max });
          }
        }
      }
@@ -258,7 +264,6 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {

  const handleMouseDown = (e: React.MouseEvent) => {
    if (isButtonHovered) return;
-
    if (mode === 'lines') {
      if (hoveredMainSplit) {
        if (e.button === 0) setDragging({ type: 'main', ...hoveredMainSplit });
@@ -285,14 +290,7 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
        }
      } else if (hoveredCell && phantomPartition) {
        if (e.button === 0) {
-          createPartition(
-              hoveredCell.i, 
-              hoveredCell.j, 
-              phantomPartition.axis, 
-              phantomPartition.offset,
-              phantomPartition.min,
-              phantomPartition.max
-          );
+          createPartition(hoveredCell.i, hoveredCell.j, phantomPartition.axis, phantomPartition.offset, phantomPartition.min, phantomPartition.max);
        }
      } else {
        setSelectedPartitionId(null);
@@ -307,7 +305,6 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
      for (let j = 0; j < sortedY.length - 1; j++) {
        const x1 = sortedX[i]; const x2 = sortedX[i + 1];
        const y1 = sortedY[j]; const y2 = sortedY[j + 1];
-
        if (y2 === undefined || x2 === undefined) continue;

        const cellX = x1 * viewBoxW; const cellY = y1 * viewBoxH;
@@ -317,6 +314,22 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
        const isHovered = hoveredCell?.i === i && hoveredCell?.j === j && mode === 'cells';
        const parts = safePartitions[key] || [];
        const isAnySelected = parts.some(p => p.id === selectedPartitionId);
+        const realW = (x2 - x1) * drawerW;
+        const realD = (y2 - y1) * drawerD;
+
+        if (parts.length === 0) {
+            const labelX = cellX + cellW / 2;
+            const labelY = cellY + cellH / 2;
+            const textW = Math.max(0, realW - wallThick).toFixed(0);
+            const textD = Math.max(0, realD - wallThick).toFixed(0);
+            if (cellH > 40 && cellW > 60) {
+                elements.push(
+                    <text key={`label-${key}`} x={labelX} y={labelY} textAnchor="middle" dominantBaseline="middle" className="fill-slate-300 font-mono text-[16px] font-bold pointer-events-none select-none opacity-80" style={{ textShadow: '1px 1px 2px rgba(0,0,0,0.8)' }}>
+                        {textW} × {textD}
+                    </text>
+                );
+            }
+        }

        elements.push(
          <g key={key}>
@@ -324,25 +337,58 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
            {isAnySelected && mode === 'cells' && <rect x={cellX} y={cellY} width={cellW} height={cellH} fill="transparent" stroke="#a855f7" strokeWidth="2" className="pointer-events-none opacity-50"/>}
            
            {parts.map(p => {
-              const pMin = p.min ?? 0; const pMax = p.max ?? 1;
+              const pMin = p.min ?? 0;
+              const pMax = p.max ?? 1;
+              if (pMax - pMin < 0.001) return null;
+
              let lx1, ly1, lx2, ly2;
+              let dist1 = 0, dist2 = 0;
+              let midX, midY;
+              const isVertical = p.axis === 'x';
              
-              if (p.axis === 'x') {
+              if (isVertical) {
                const px = cellX + (cellW * p.offset);
                lx1 = px; lx2 = px;
                ly1 = cellY + (cellH * pMin); ly2 = cellY + (cellH * pMax);
+                
+                const neighbors = getNeighborOffsets(p.offset, (pMin + pMax)/2, p.axis, parts);
+                dist1 = Math.abs((p.offset - neighbors.min) * realW) - wallThick;
+                dist2 = Math.abs((neighbors.max - p.offset) * realW) - wallThick;
+                midX = px; midY = (ly1 + ly2) / 2;
              } else {
                const py = cellY + (cellH * p.offset);
                ly1 = py; ly2 = py;
                lx1 = cellX + (cellW * pMin); lx2 = cellX + (cellW * pMax);
+                
+                const neighbors = getNeighborOffsets(p.offset, (pMin + pMax)/2, p.axis, parts);
+                dist1 = Math.abs((p.offset - neighbors.min) * realD) - wallThick;
+                dist2 = Math.abs((neighbors.max - p.offset) * realD) - wallThick;
+                midX = (lx1 + lx2) / 2; midY = py;
              }
+              
              const isSel = selectedPartitionId === p.id;
              const isHov = hoveredPartition?.id === p.id;
+              const textOffset = 12;
              
              return (
-                <g key={p.id} onDoubleClick={(e) => { e.stopPropagation(); removePartition(key, p.id); }}>
-                  <line x1={lx1} y1={ly1} x2={lx2} y2={ly2} stroke="transparent" strokeWidth="30" />
-                  <line x1={lx1} y1={ly1} x2={lx2} y2={ly2} stroke={isSel ? "#a855f7" : (isHov ? "#d8b4fe" : "#7e22ce")} strokeWidth={isSel ? 6 : 4} strokeLinecap="round" />
+                <g key={p.id}>
+                    <g onDoubleClick={(e) => { e.stopPropagation(); removePartition(key, p.id); }}>
+                        <line x1={lx1} y1={ly1} x2={lx2} y2={ly2} stroke="transparent" strokeWidth="40" />
+                        <line x1={lx1} y1={ly1} x2={lx2} y2={ly2} stroke={isSel ? "#a855f7" : (isHov ? "#d8b4fe" : "#7e22ce")} strokeWidth={isSel ? 6 : 4} strokeLinecap="round" />
+                    </g>
+                    <g className="pointer-events-none select-none font-mono text-[14px] font-bold fill-white" style={{ textShadow: '0px 0px 3px #000' }}>
+                        {isVertical ? (
+                            <>
+                                <text x={midX - textOffset} y={midY} textAnchor="end" dominantBaseline="middle">{Math.max(0, dist1).toFixed(0)}</text>
+                                <text x={midX + textOffset} y={midY} textAnchor="start" dominantBaseline="middle">{Math.max(0, dist2).toFixed(0)}</text>
+                            </>
+                        ) : (
+                            <>
+                                <text x={midX} y={midY - textOffset} textAnchor="middle" dominantBaseline="auto">{Math.max(0, dist1).toFixed(0)}</text>
+                                <text x={midX} y={midY + textOffset * 2} textAnchor="middle" dominantBaseline="auto">{Math.max(0, dist2).toFixed(0)}</text>
+                            </>
+                        )}
+                    </g>
                </g>
              );
            })}
@@ -350,16 +396,14 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
            {isHovered && phantomPartition && !hoveredPartition && !dragging && (
              <g className="pointer-events-none opacity-60">
                {(() => {
-                    const pMin = phantomPartition.min; const pMax = phantomPartition.max;
+                    const { min, max } = phantomPartition;
                    let fx1, fy1, fx2, fy2;
                    if (phantomPartition.axis === 'x') {
                        const px = cellX + (cellW * phantomPartition.offset);
-                        fx1 = px; fx2 = px;
-                        fy1 = cellY + (cellH * pMin); fy2 = cellY + (cellH * pMax);
+                        fx1 = px; fx2 = px; fy1 = cellY + (cellH * min); fy2 = cellY + (cellH * max);
                    } else {
                        const py = cellY + (cellH * phantomPartition.offset);
-                        fy1 = py; fy2 = py;
-                        fx1 = cellX + (cellW * pMin); fx2 = cellX + (cellW * pMax);
+                        fy1 = py; fy2 = py; fx1 = cellX + (cellW * min); fx2 = cellX + (cellW * max);
                    }
                    return <line x1={fx1} y1={fy1} x2={fx2} y2={fy2} stroke="#34d399" strokeWidth="3" strokeDasharray="6,6"/>;
                })()}
@@ -373,143 +417,60 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
  };

  return (
-    <div className="bg-slate-900 p-4 rounded-xl shadow-lg border border-slate-800 h-full flex flex-col relative overflow-hidden">
-      
-      {/* TOOLBAR */}
-      <div className="flex justify-between items-center mb-2 z-20 shrink-0">
-        <h2 className="text-lg font-bold flex items-center gap-2 text-primary">
-          <Grid size={20} /> 2. Редактор макета
-        </h2>
-        
-        <div className="flex bg-slate-800 p-1 rounded-lg border border-slate-700">
-            <button onClick={() => { setMode('lines'); setSelectedPartitionId(null); }} 
-                className={`flex items-center gap-2 px-3 py-1.5 rounded-md text-xs font-bold transition-all ${mode === 'lines' ? 'bg-primary text-white shadow' : 'text-gray-400 hover:text-gray-200'}`}>
-               <Move size={14}/> Границы
-            </button>
-            <button onClick={() => setMode('cells')} 
-                className={`flex items-center gap-2 px-3 py-1.5 rounded-md text-xs font-bold transition-all ${mode === 'cells' ? 'bg-primary text-white shadow' : 'text-gray-400 hover:text-gray-200'}`}>
-               <Grid size={14}/> Внутри ячеек
-            </button>
-        </div>
+    <div className="flex w-full h-full bg-slate-900 border border-slate-800 rounded-xl overflow-hidden shadow-2xl">
+      <div className="flex-1 flex flex-col relative min-w-0">
+          <div className="flex justify-between items-center p-3 border-b border-slate-800 bg-slate-900 z-10 shrink-0">
+            <h2 className="text-sm font-bold flex items-center gap-2 text-primary"><Grid size={18} /> Редактор</h2>
+            <div className="flex bg-slate-800 p-1 rounded-lg border border-slate-700">
+                <button onClick={() => { setMode('lines'); setSelectedPartitionId(null); }} className={`flex items-center gap-2 px-3 py-1.5 rounded-md text-xs font-bold transition-all ${mode === 'lines' ? 'bg-primary text-white shadow' : 'text-gray-400 hover:text-gray-200'}`}><Move size={14}/> Границы</button>
+                <button onClick={() => setMode('cells')} className={`flex items-center gap-2 px-3 py-1.5 rounded-md text-xs font-bold transition-all ${mode === 'cells' ? 'bg-primary text-white shadow' : 'text-gray-400 hover:text-gray-200'}`}><Grid size={14}/> Внутри ячеек</button>
+            </div>
+            <button onClick={() => onChange({ x: [], y: [], partitions: {} })} className="px-3 py-1.5 text-xs text-red-400 border border-slate-700 rounded hover:bg-slate-800 transition-colors flex items-center gap-1"><RotateCcw size={14} /> Сброс</button>
+          </div>

-        <button onClick={() => onChange({ x: [], y: [], partitions: {} })} className="px-3 py-1.5 text-xs text-red-400 border border-slate-700 rounded hover:bg-slate-800 transition-colors flex items-center gap-1">
-            <RotateCcw size={14} /> Сброс
-        </button>
-      </div>
-
-      {/* INFO BAR */}
-      <div className="bg-slate-800/50 rounded-lg px-3 py-2 mb-2 flex items-center gap-3 text-[11px] text-gray-300 border border-slate-700/50 shrink-0">
-          <MousePointer2 size={14} className="text-primary" />
-          {mode === 'lines' ? (
-              <div className="flex gap-3">
-                  <span><b className="text-blue-400">ЛКМ:</b> Линия</span>
-                  <span><b className="text-red-400">ПКМ:</b> Удалить</span>
-              </div>
-          ) : (
-              <div className="flex gap-3">
-                  <span><b className="text-green-400">ЛКМ в ячейке:</b> Стенка (T-соединения)</span>
-                  <span><b className="text-purple-400">Драг:</b> Двигать</span>
-                  <span><b className="text-red-400">2xЛКМ:</b> Удалить</span>
-              </div>
-          )}
-      </div>
-
-      {/* WORKSPACE */}
-      <div className="flex-1 bg-slate-800/30 rounded-lg flex flex-col items-center justify-center relative overflow-hidden border border-slate-700/50 min-h-0 w-full">
-            <div className="relative w-full h-full flex items-center justify-center p-4">
-                <div 
-                    className="relative shadow-2xl bg-[#1e293b] border border-slate-600 rounded-sm overflow-hidden"
-                    style={{ 
-                        width: aspectRatio > 1 ? 'auto' : '100%',
-                        height: aspectRatio > 1 ? '100%' : 'auto',
-                        aspectRatio: `${1/aspectRatio}`,
-                        maxHeight: '100%', maxWidth: '100%',
-                        cursor: mode === 'lines' ? (dragging ? 'grabbing' : hoveredMainSplit ? 'col-resize' : 'crosshair') 
-                               : (dragging ? 'grabbing' : hoveredPartition ? 'grab' : hoveredCell ? 'crosshair' : 'default'),
-                    }}
-                >   
-                   <svg ref={svgRef} viewBox={`0 0 ${viewBoxW} ${viewBoxH}`} className="w-full h-full touch-none block"
-                      preserveAspectRatio="none"
-                      onMouseMove={handleMouseMove} onMouseDown={handleMouseDown} onMouseUp={() => setDragging(null)} onMouseLeave={() => setDragging(null)} onContextMenu={(e) => e.preventDefault()}
-                   >
-                      <defs>
-                          <pattern id="grid" width="50" height="50" patternUnits="userSpaceOnUse">
-                              <path d="M 50 0 L 0 0 0 50" fill="none" stroke="rgba(255,255,255,0.03)" strokeWidth="1"/>
-                          </pattern>
-                      </defs>
+          <div className="flex-1 bg-slate-800/30 flex items-center justify-center p-4 overflow-hidden relative">
+                <div className="relative shadow-2xl bg-[#1e293b] border border-slate-600 rounded-sm overflow-hidden" style={{ width: aspectRatio > 1 ? 'auto' : '100%', height: aspectRatio > 1 ? '100%' : 'auto', aspectRatio: `${1/aspectRatio}`, maxHeight: '100%', maxWidth: '100%', cursor: mode === 'lines' ? (dragging ? 'grabbing' : hoveredMainSplit ? 'col-resize' : 'crosshair') : (dragging ? 'grabbing' : hoveredPartition ? 'grab' : hoveredCell ? 'crosshair' : 'default') }}>   
+                   <svg ref={svgRef} viewBox={`0 0 ${viewBoxW} ${viewBoxH}`} className="w-full h-full touch-none block" onMouseMove={handleMouseMove} onMouseDown={handleMouseDown} onMouseUp={() => setDragging(null)} onMouseLeave={() => setDragging(null)} onContextMenu={(e) => e.preventDefault()}>
+                      <defs><pattern id="grid" width="50" height="50" patternUnits="userSpaceOnUse"><path d="M 50 0 L 0 0 0 50" fill="none" stroke="rgba(255,255,255,0.03)" strokeWidth="1"/></pattern></defs>
                      <rect width="100%" height="100%" fill="url(#grid)" />
-
                      {renderCellsAndPartitions()}
-
-                      {/* MAIN GRID X */}
                      {safeX.map((x, i) => (
                        <g key={`x-${i}`} onMouseMove={(e) => { if(mode === 'lines' && !dragging) { e.stopPropagation(); setHoveredMainSplit({axis: 'x', index: i}); setPhantomMainAxis(null); }}} onDoubleClick={(e) => { e.stopPropagation(); removeMainSplit('x', i); }}>
                            <line x1={x * viewBoxW} y1="0" x2={x * viewBoxW} y2="100%" stroke="transparent" strokeWidth="40" className={mode === 'lines' ? "cursor-col-resize" : ""} />
                            <line x1={x * viewBoxW} y1="0" x2={x * viewBoxW} y2="100%" stroke={hoveredMainSplit?.axis === 'x' && hoveredMainSplit.index === i ? "#f59e0b" : "#64748b"} strokeWidth={hoveredMainSplit?.axis === 'x' && hoveredMainSplit.index === i ? 6 : 4} className="pointer-events-none" />
                        </g>
                      ))}
-
-                      {/* MAIN GRID Y */}
                      {safeY.map((y, i) => (
                        <g key={`y-${i}`} onMouseMove={(e) => { if(mode === 'lines' && !dragging) { e.stopPropagation(); setHoveredMainSplit({axis: 'y', index: i}); setPhantomMainAxis(null); }}} onDoubleClick={(e) => { e.stopPropagation(); removeMainSplit('y', i); }}>
                            <line x1="0" y1={y * viewBoxH} x2="100%" y2={y * viewBoxH} stroke="transparent" strokeWidth="40" className={mode === 'lines' ? "cursor-row-resize" : ""} />
                            <line x1="0" y1={y * viewBoxH} x2="100%" y2={y * viewBoxH} stroke={hoveredMainSplit?.axis === 'y' && hoveredMainSplit.index === i ? "#f59e0b" : "#64748b"} strokeWidth={hoveredMainSplit?.axis === 'y' && hoveredMainSplit.index === i ? 6 : 4} className="pointer-events-none" />
                        </g>
                      ))}
-
-                      {/* MAIN PHANTOMS */}
-                      {mode === 'lines' && !hoveredMainSplit && !dragging && phantomMainAxis === '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' && !hoveredMainSplit && !dragging && phantomMainAxis === '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' && !hoveredMainSplit && !dragging && phantomMainAxis && (
+                        <line x1={phantomMainAxis === 'x' ? mousePos.x * viewBoxW : 0} y1={phantomMainAxis === 'y' ? mousePos.y * viewBoxH : 0} x2={phantomMainAxis === 'x' ? mousePos.x * viewBoxW : '100%'} y2={phantomMainAxis === 'y' ? mousePos.y * viewBoxH : '100%'} stroke="#3b82f6" strokeWidth="4" strokeDasharray="8,8" className="pointer-events-none opacity-50"/>
+                      )}
                   </svg>
                </div>
+          </div>
+      </div>
+
+      {mode === 'cells' && selectedData ? (
+        <div className="w-72 bg-slate-900 border-l border-slate-800 p-4 flex flex-col shrink-0 z-20">
+            <div className="flex justify-between items-center mb-6"><h3 className="text-sm font-bold text-white flex items-center gap-2"><Settings2 size={16} className="text-purple-400"/>Настройки</h3><button onClick={() => setSelectedPartitionId(null)} className="text-gray-400 hover:text-white"><X size={20}/></button></div>
+            <div className="bg-slate-800 p-4 rounded border border-slate-700 space-y-6">
+                <div><div className="flex justify-between text-xs text-gray-300 mb-2"><span>Высота</span> <span className="font-mono bg-slate-900 px-1.5 py-0.5 rounded text-xs">{selectedData.part.height} мм</span></div><input type="range" min="5" max={config.drawer.height || 100} step="1" value={selectedData.part.height} onChange={(e) => updatePartition(selectedData.key, selectedData.part.id, { height: parseFloat(e.target.value) })} className="w-full h-1 bg-slate-600 rounded-lg appearance-none cursor-pointer accent-purple-500"/></div>
+                <div className="flex items-center justify-between"><label htmlFor="rounded-check" className="text-xs text-gray-300 cursor-pointer select-none">Скруглить края</label><input type="checkbox" id="rounded-check" checked={selectedData.part.rounded} onChange={(e) => updatePartition(selectedData.key, selectedData.part.id, { rounded: e.target.checked })} className="w-4 h-4 rounded bg-slate-700 border-slate-600 text-purple-500 focus:ring-0 cursor-pointer"/></div>
+                <button onClick={() => removePartition(selectedData.key, selectedData.part.id)} className="w-full py-2 bg-red-500/10 hover:bg-red-500/20 text-red-400 border border-red-500/30 rounded text-xs flex items-center justify-center gap-2 transition-colors mt-4"><Trash2 size={14}/> Удалить</button>
            </div>
-
-            {/* --- SIDEBAR FOR EDITING --- */}
-            {mode === 'cells' && selectedData && (
-                <div className="absolute top-0 right-0 bottom-0 w-72 bg-slate-900 border-l border-slate-700 p-4 shadow-2xl flex flex-col z-30 animate-in slide-in-from-right duration-200">
-                    <div className="flex justify-between items-center mb-6">
-                        <h3 className="text-sm font-bold text-white flex items-center gap-2">
-                            <Settings size={16} className="text-purple-400"/> Настройки стенки
-                        </h3>
-                        <button onClick={() => setSelectedPartitionId(null)} className="text-gray-400 hover:text-white"><X size={20}/></button>
-                    </div>
-
-                    <div className="bg-slate-800 p-4 rounded border border-slate-700 space-y-6">
-                        {/* Height */}
-                        <div>
-                            <div className="flex justify-between text-xs text-gray-300 mb-2">
-                                <span>Высота</span> <span className="font-mono bg-slate-900 px-1.5 py-0.5 rounded text-xs">{selectedData.part.height} мм</span>
-                            </div>
-                            <input type="range" min="5" max={config.drawer.height || 100} step="1" value={selectedData.part.height}
-                                onChange={(e) => updatePartition(selectedData.key, selectedData.part.id, { height: parseFloat(e.target.value) })}
-                                className="w-full h-1 bg-slate-600 rounded-lg appearance-none cursor-pointer accent-purple-500"
-                            />
-                        </div>
-
-                        {/* Rounded */}
-                        <div className="flex items-center justify-between">
-                            <label htmlFor="rounded-check" className="text-xs text-gray-300 cursor-pointer select-none">Скруглить края</label>
-                            <input type="checkbox" id="rounded-check" checked={selectedData.part.rounded}
-                                onChange={(e) => updatePartition(selectedData.key, selectedData.part.id, { rounded: e.target.checked })}
-                                className="w-4 h-4 rounded bg-slate-700 border-slate-600 text-purple-500 focus:ring-0 cursor-pointer"
-                            />
-                        </div>
-
-                        {/* Delete */}
-                        <button 
-                            onClick={() => removePartition(selectedData.key, selectedData.part.id)}
-                            className="w-full py-2 bg-red-500/10 hover:bg-red-500/20 text-red-400 border border-red-500/30 rounded text-xs flex items-center justify-center gap-2 transition-colors mt-4"
-                        >
-                            <Trash2 size={14}/> Удалить
-                        </button>
-                    </div>
-                    
-                    <div className="mt-auto text-[10px] text-gray-500 text-center leading-relaxed">
-                        Выделите стенку для настройки.<br/>Двойной клик удаляет её.
-                    </div>
-                </div>
-            )}
+            <div className="mt-auto text-[10px] text-gray-500 text-center leading-relaxed">Выделите стенку для настройки.<br/>Двойной клик удаляет её.</div>
        </div>
+      ) : (
+        <div className="w-72 bg-slate-900/50 border-l border-slate-800 p-8 flex flex-col items-center justify-center text-center text-gray-500 shrink-0">
+            <MousePointer2 size={32} className="mb-4 opacity-50"/>
+            <p className="text-sm">Выберите стенку для настройки</p>
+            <p className="text-xs mt-2 opacity-50">Кликните по любой перегородке внутри ячейки</p>
+        </div>
+      )}
    </div>
  );
 };
--- a/src/services/geometryGenerator.ts
+++ b/src/services/geometryGenerator.ts
@@ -15,11 +15,13 @@ export const calculateParts = (config: AppConfig, splits: LayoutSplits): Generat

  for (let i = 0; i < xPoints.length - 1; i++) {
    for (let j = 0; j < yPoints.length - 1; j++) {
-      const rawX = xPoints[i] * config.drawer.width;
-      const rawY = yPoints[j] * config.drawer.depth;
      const rawW = (xPoints[i + 1] - xPoints[i]) * config.drawer.width;
      const rawD = (yPoints[j + 1] - yPoints[j]) * config.drawer.depth;
+      
+      if (rawW < 5 || rawD < 5) continue;

+      const rawX = xPoints[i] * config.drawer.width;
+      const rawY = yPoints[j] * config.drawer.depth;
      const internalPartitions = safeParts[`${i}-${j}`] || [];

      const realWidth = rawW - config.printerTolerance;
@@ -27,8 +29,6 @@ export const calculateParts = (config: AppConfig, splits: LayoutSplits): Generat
      const realX = rawX + (config.printerTolerance / 2);
      const realY = rawY + (config.printerTolerance / 2);

-      if (realWidth < 5 || realDepth < 5) continue;
-
      parts.push({
          id: `part-${partCounter}`,
          name: `Ячейка ${i+1}-${j+1}`,
@@ -48,12 +48,11 @@ export const calculateParts = (config: AppConfig, splits: LayoutSplits): Generat

 // --- ГЕОМЕТРИЯ ---

-// 1. Форма скругленного прямоугольника (для дна и внешних стенок)
 const createRoundedRectShape = (width: number, height: number, radius: number): THREE.Shape => {
  const shape = new THREE.Shape();
  const x = -width / 2;
  const y = -height / 2;
-  const r = Math.min(radius, width / 2, height / 2);
+  const r = Math.min(radius, width / 2 - 0.1, height / 2 - 0.1);

  if (r <= 0.1) {
      shape.moveTo(x, y);
@@ -75,20 +74,12 @@ const createRoundedRectShape = (width: number, height: number, radius: number):
  return shape;
 };

-// 2. Форма галтели (вогнутого треугольника) для углов
-const createFilletShape = (radius: number): THREE.Shape => {
+const createConcaveFilletShape = (radius: number): THREE.Shape => {
    const shape = new THREE.Shape();
-    // Начинаем из угла (0,0)
    shape.moveTo(0, 0);
-    // Линия вдоль одной стенки
    shape.lineTo(radius, 0);
-    // Вогнутая дуга к другой стенке
-    // Центр окружности (radius, radius), радиус radius.
-    // Рисуем дугу от 270 (-PI/2) до 180 (PI) градусов по часовой стрелке
-    shape.absarc(radius, radius, radius, 1.5 * Math.PI, Math.PI, true);
-    // Замыкаем в угол
+    shape.absarc(radius, radius, radius, -Math.PI / 2, -Math.PI, true);
    shape.lineTo(0, 0);
-    
    return shape;
 };

@@ -97,39 +88,41 @@ export const createBinGeometry = (
 ): THREE.BufferGeometry => {
  const geometries: THREE.BufferGeometry[] = [];

-  // ДНО
+  // ДНО И ВНЕШНИЕ СТЕНКИ
  const floorShape = createRoundedRectShape(width, depth, radius);
-  const floorGeo = new THREE.ExtrudeGeometry(floorShape, { depth: thickness, bevelEnabled: false, curveSegments: 12 });
+  const floorGeo = new THREE.ExtrudeGeometry(floorShape, { depth: thickness, bevelEnabled: false });
  floorGeo.rotateX(-Math.PI / 2);
  geometries.push(floorGeo);

-  // ВНЕШНИЕ СТЕНКИ
  const outerShape = createRoundedRectShape(width, depth, radius);
-  const innerRadius = Math.max(0, radius - thickness);
+  const innerRadius = Math.max(0.1, radius - thickness);
  const innerWidth = width - (2 * thickness);
  const innerDepth = depth - (2 * thickness);
  
-  if (innerWidth > 0 && innerDepth > 0) {
+  if (innerWidth > 0.1 && innerDepth > 0.1) {
      const innerHole = createRoundedRectShape(innerWidth, innerDepth, innerRadius);
      outerShape.holes.push(innerHole);
  }

  const wallHeight = height - thickness;
-  const wallGeo = new THREE.ExtrudeGeometry(outerShape, { depth: wallHeight, bevelEnabled: false, curveSegments: 12 });
+  const wallGeo = new THREE.ExtrudeGeometry(outerShape, { depth: wallHeight, bevelEnabled: false });
  wallGeo.rotateX(-Math.PI / 2);
  wallGeo.translate(0, thickness, 0);
  geometries.push(wallGeo);

-  // ВНУТРЕННИЕ ПЕРЕГОРОДКИ И СКРУГЛЕНИЯ
+  // ВНУТРЕННИЕ ПЕРЕГОРОДКИ
+  // Мы просто верим сохраненным данным (p.min/p.max). Они должны быть корректны при создании.
  partitions.forEach(p => {
      const pMin = p.min ?? 0;
      const pMax = p.max ?? 1;
+
+      if (pMax - pMin < 0.01) return;
+
      const lengthRatio = pMax - pMin;
      const midRatio = pMin + (lengthRatio / 2);

      let pWidth = 0, pDepth = 0, pX = 0, pY = 0; 
      
-      // Размеры самой стенки
      if (p.axis === 'x') {
          pWidth = thickness;
          pDepth = lengthRatio * innerDepth; 
@@ -142,71 +135,44 @@ export const createBinGeometry = (
          pY = (-innerDepth / 2) + (innerDepth * p.offset);
      }

-      // Создаем стенку
-      const partShape = createRoundedRectShape(pWidth, pDepth, 0.1); // Чуть-чуть скругляем саму стенку, чтобы не была острой
-      const partGeo = new THREE.ExtrudeGeometry(partShape, { depth: p.height, bevelEnabled: false, curveSegments: 2 });
+      const partShape = createRoundedRectShape(pWidth, pDepth, 0.1); 
+      const partGeo = new THREE.ExtrudeGeometry(partShape, { depth: p.height, bevelEnabled: false });
      partGeo.rotateX(-Math.PI / 2);
      partGeo.translate(pX, thickness, pY);
      geometries.push(partGeo);

-      // --- ДОБАВЛЕНИЕ ГАЛТЕЛЕЙ (FILLETS) ---
-      if (p.rounded && radius > 0.5) {
-          // Радиус скругления такой же, как у углов ящика, но не больше разумного предела
-          const filletR = Math.min(radius, 6); 
-          const filletShape = createFilletShape(filletR);
-          const filletExtrudeSettings = { depth: p.height, bevelEnabled: false, curveSegments: 8 };
+      // СКРУГЛЕНИЯ
+      if (p.rounded && radius > 1) {
+          const filletR = Math.min(radius, 5); 
+          const filletShape = createConcaveFilletShape(filletR);
+          const filletExtrude = { depth: p.height, bevelEnabled: false };

-          // Функция для создания и позиционирования одной галтели
-          const addFillet = (x: number, y: number, rotation: number) => {
-              const geo = new THREE.ExtrudeGeometry(filletShape, filletExtrudeSettings);
-              geo.rotateX(-Math.PI / 2); // Положить на пол
-              geo.rotateY(rotation);     // Повернуть в нужный угол
-              
-              // Корректировка позиции после вращения вокруг (0,0)
-              // Нам нужно сместить так, чтобы угол (0,0) галтели совпал с углом стыка
+          const addFillet = (x: number, y: number, rotY: number) => {
+              const geo = new THREE.ExtrudeGeometry(filletShape, filletExtrude);
+              geo.rotateX(-Math.PI / 2);
+              geo.rotateY(rotY); 
              geo.translate(x, thickness, y);
              geometries.push(geo);
          };

-          const halfThick = thickness / 2;
+          const h = thickness / 2;

          if (p.axis === 'x') {
-              // Вертикальная стенка. Концы: Top (pMin) и Bottom (pMax) (в 2D координатах Y)
-              // Y координата начала: -innerDepth/2 + innerDepth * pMin
-              // Y координата конца: -innerDepth/2 + innerDepth * pMax
-              // X координата центра: pX
-              
-              const startY = (-innerDepth / 2) + (innerDepth * pMin);
-              const endY = (-innerDepth / 2) + (innerDepth * pMax);
+              const topY = (-innerDepth / 2) + (innerDepth * pMin);
+              addFillet(pX - h, topY, Math.PI);
+              addFillet(pX + h, topY, -Math.PI / 2);

-              // 4 Угла:
-              // 1. Start Left: X = pX - halfThick, Y = startY. Rotation: 0 (смотрит вправо-вверх? нет)
-              //    Галтель рисуется в +X, +Y квадранте от 0,0.
-              //    Нам нужно заполнить угол между стенкой (идет вниз) и перпендикуляром.
-              
-              // Start (Top in 2D view, actually Min Y in 3D logic here usually means "Back")
-              // Let's assume standard plan view:
-              // Min Y is "Top" edge visually in SVG usually 0. In 3D Z is Y.
-              
-              // Min End (Start of wall):
-              addFillet(pX - halfThick, startY, 0);           // Left side, pointing towards +Z (down in visual)
-              addFillet(pX + halfThick, startY, -Math.PI/2);  // Right side
-
-              // Max End (End of wall):
-              addFillet(pX - halfThick, endY, Math.PI/2);     // Left side
-              addFillet(pX + halfThick, endY, Math.PI);       // Right side
+              const botY = (-innerDepth / 2) + (innerDepth * pMax);
+              addFillet(pX - h, botY, Math.PI / 2);
+              addFillet(pX + h, botY, 0);
          } else {
-              // Горизонтальная стенка
-              const startX = (-innerWidth / 2) + (innerWidth * pMin);
-              const endX = (-innerWidth / 2) + (innerWidth * pMax);
+              const leftX = (-innerWidth / 2) + (innerWidth * pMin);
+              addFillet(leftX, pY - h, 0);
+              addFillet(leftX, pY + h, -Math.PI / 2);

-              // Min End (Left side):
-              addFillet(startX, pY + halfThick, -Math.PI/2);
-              addFillet(startX, pY - halfThick, 0);
-
-              // Max End (Right side):
-              addFillet(endX, pY + halfThick, Math.PI);
-              addFillet(endX, pY - halfThick, Math.PI/2);
+              const rightX = (-innerWidth / 2) + (innerWidth * pMax);
+              addFillet(rightX, pY - h, Math.PI / 2);
+              addFillet(rightX, pY + h, Math.PI);
          }
      }
  });