F

Reviewed-on: http://192.168.1.114:3000/rust/BoxGenerator/pulls/10

Dockerfile

@@ -0,0 +1,19 @@
+# Build stage
+FROM node:20-alpine as build
+
+WORKDIR /app
+
+COPY package*.json ./
+RUN npm ci
+
+COPY . .
+RUN npm run build
+
+# Production stage
+FROM nginx:alpine
+
+COPY --from=build /app/dist /usr/share/nginx/html
+
+EXPOSE 80
+
+CMD ["nginx", "-g", "daemon off;"]

README.md

@@ -18,3 +18,55 @@ View your app in AI Studio: https://ai.studio/apps/drive/1gUfO_tgl_CPfAGf1eXuSFy
 2. Set the `GEMINI_API_KEY` in [.env.local](.env.local) to your Gemini API key
 3. Run the app:
    `npm run dev`
+
+### 💾 Экспорт и Шеринг
+- **STL Экспорт**: Генерация готовых к печати STL файлов. Можно скачать отдельные детали или весь проект архивом (ZIP).
+- **Сохранение проектов**: Возможность поделиться ссылкой на конфигурацию (все параметры кодируются в URL).
+
+## 🚀 Запуск Локально
+
+Для работы требуется установленный **Node.js**.
+
+1. Клонируйте репозиторий:
+   ```bash
+   git clone https://github.com/your-username/printfit-box-generator.git
+   cd printfit-box-generator
+   ```
+
+2. Установите зависимости:
+   ```bash
+   npm install
+   ```
+
+3. Запустите локальный сервер разработки:
+   ```bash
+   npm run dev
+   ```
+
+4. Откройте приложение в браузере (обычно http://localhost:5173).
+
+## 🐳 Запуск в Docker
+
+Приложение можно легко развернуть в контейнере Docker (используется Nginx для раздачи статики).
+
+1. Соберите образ:
+   ```bash
+   docker build -t printfit-app .
+   ```
+
+2. Запустите контейнер:
+   ```bash
+   docker run -p 8080:80 printfit-app
+   ```
+
+3. Откройте http://localhost:8080
+
+## 🛠 Технологический Стек
+- **React**: UI и управление состоянием.
+- **Three.js (@react-three/fiber)**: 3D рендеринг и геометрия.
+- **Tailwind CSS**: Стилизация интерфейса.
+- **Vite**: Сборщик проекта.
+- **Lucide React**: Иконки.
+
+## 📝 Лицензия
+Этот проект распространяется под лицензией MIT. Вы можете свободно использовать, изменять и распространять его.

src/App.tsx

@@ -29,10 +29,16 @@ const App = () => {
   const [step, setStep] = useState(1);
 
   const [config, setConfig] = useState<AppConfig>({
-    drawer: { width: 300, depth: 400, height: 80 },
+    drawer: { width: 100, depth: 100, height: 100 },
-    wallThickness: 1.2,
+    wallThickness: 0.8,
     printerTolerance: 0.5,
     cornerRadius: 4,
+    perforation: {
+      enabled: true,
+      shape: 'honeycomb',
+      size: 8,
+      gap: 2
+    }
   });
 
   const [splits, setSplits] = useState<LayoutSplits>({

src/components/ConfigStep.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { AppConfig } from '../types';
+import { AppConfig, PerforationShape } from '../types';
-import { Ruler, Box, Layers, Minimize2, CircleDashed } from 'lucide-react';
+import { Ruler, Box, Layers, Minimize2, CircleDashed, Grid, Circle, Hexagon, Triangle } from 'lucide-react';
 
 interface Props {
   config: AppConfig;
@@ -39,13 +39,92 @@ const NumberInput = ({
   </div>
 );
 
+const PerforationPreview = ({ config }: { config: AppConfig['perforation'] }) => {
+  if (!config.enabled) return (
+    <div className="w-full h-48 bg-slate-950 rounded-lg border border-slate-800 flex items-center justify-center text-gray-600">
+      <span className="text-sm">Перфорация отключена</span>
+    </div>
+  );
+
+  // Simple canvas-like SVG generation
+  const width = 200;
+  const height = 120;
+  const size = config.size * 2; // Scale up mostly for visibility
+  const gap = config.gap * 2;
+  const step = size + gap;
+
+  const elements = [];
+
+  if (config.shape === 'circle') {
+    for (let y = 0; y < height; y += step) {
+      for (let x = 0; x < width; x += step) {
+        elements.push(<circle key={`${x}-${y}`} cx={x + step / 2} cy={y + step / 2} r={size / 2} fill="#3b82f6" />);
+      }
+    }
+  } else if (config.shape === 'honeycomb') {
+    const hStep = size * 0.866; // height of equilateral triangle
+    for (let y = 0; y < height; y += (size + gap) * 0.85) {
+      const row = Math.floor(y / ((size + gap) * 0.85));
+      const xOffset = row % 2 === 0 ? 0 : (size + gap) / 2;
+      for (let x = xOffset - step; x < width; x += step) {
+        // Hexagon points
+        const r = size / 2;
+        const cx = x + step / 2;
+        const cy = y + step / 2;
+        // Points for flat-topped hexagon
+        const points = [];
+        for (let i = 0; i < 6; i++) {
+          const angle_deg = 60 * i + 30;
+          const angle_rad = Math.PI / 180 * angle_deg;
+          points.push(`${cx + r * Math.cos(angle_rad)},${cy + r * Math.sin(angle_rad)}`);
+        }
+        elements.push(<polygon key={`${x}-${y}`} points={points.join(" ")} fill="#3b82f6" />);
+      }
+    }
+  } else if (config.shape === 'triangle') {
+    for (let y = 0; y < height; y += step * 0.866) { // Staggered rows
+      const row = Math.floor(y / (step * 0.866));
+      const xOffset = row % 2 === 0 ? 0 : step / 2;
+      for (let x = -step + xOffset; x < width; x += step) {
+        const cx = x + step / 2;
+        const cy = y + step / 2;
+        const r = size / 2;
+        // Upright triangle
+        const points = [
+          `${cx},${cy - r}`,
+          `${cx + r * 0.866},${cy + r * 0.5}`,
+          `${cx - r * 0.866},${cy + r * 0.5}`
+        ];
+        elements.push(<polygon key={`${x}-${y}`} points={points.join(" ")} fill="#3b82f6" />);
+      }
+    }
+  }
+
+  return (
+    <div className="w-full h-48 bg-slate-950 rounded-lg border border-slate-800 overflow-hidden relative">
+      <svg width="100%" height="100%" viewBox={`0 0 ${width} ${height}`} preserveAspectRatio="xMidYMid slice">
+        {elements}
+      </svg>
+      <div className="absolute top-2 right-2 text-xs text-gray-500">:: Масштаб условен</div>
+    </div>
+  );
+}
+
+
 export const ConfigStep: React.FC<Props> = ({ config, onChange }) => {
   const updateDrawer = (key: keyof AppConfig['drawer'], val: number) => {
     onChange({ ...config, drawer: { ...config.drawer, [key]: val } });
   };
 
+  const updatePerforation = (key: keyof AppConfig['perforation'], val: any) => {
+    onChange({ ...config, perforation: { ...config.perforation, [key]: val } })
+  }
+
   return (
-    <div className="bg-slate-900 p-6 rounded-xl shadow-lg border border-slate-800 animate-fade-in">
+    <div className="bg-slate-900 p-6 rounded-xl shadow-lg border border-slate-800 animate-fade-in space-y-8">
+
+      {/* SECTION 1: Dimensions & Settings */}
+      <div>
         <h2 className="text-xl font-bold mb-6 flex items-center gap-2 text-primary">
           <Box size={24} /> 1. Размеры
         </h2>
@@ -96,7 +175,7 @@ export const ConfigStep: React.FC<Props> = ({ config, onChange }) => {
               </div>
             </div>
 
-           {/* Corner Radius (NEW) */}
+            {/* Corner Radius */}
             <div className="mb-6">
               <div className="flex justify-between items-center mb-2">
                 <label className="text-sm font-medium text-gray-300 flex items-center gap-1">
@@ -149,5 +228,93 @@ export const ConfigStep: React.FC<Props> = ({ config, onChange }) => {
           </div>
         </div>
       </div>
+
+      {/* SECTION 2: Perforation */}
+      <div className="bg-slate-800/30 p-6 rounded-lg border border-slate-700/50">
+        <div className="flex items-center justify-between mb-6">
+          <h3 className="text-lg font-semibold flex items-center gap-2 text-blue-400">
+            <Grid size={20} /> 2. Перфорация (узоры)
+          </h3>
+
+          <div className="flex items-center gap-3">
+            <span className="text-sm font-medium text-gray-400 uppercase tracking-wider">Включено</span>
+            <button
+              onClick={() => updatePerforation('enabled', !config.perforation.enabled)}
+              className={`w-12 h-6 rounded-full relative transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 ${config.perforation.enabled ? 'bg-blue-600' : 'bg-slate-600'}`}
+            >
+              <span className={`block w-4 h-4 rounded-full bg-white shadow transform transition-transform duration-200 ease-in-out absolute top-1 ${config.perforation.enabled ? 'translate-x-7' : 'translate-x-1'}`} />
+            </button>
+          </div>
+        </div>
+
+        <div className={`grid grid-cols-1 md:grid-cols-2 gap-8 transition-all duration-300 ${config.perforation.enabled ? 'opacity-100 pointer-events-auto' : 'opacity-40 pointer-events-none filter blur-[1px]'}`}>
+          <div>
+            <label className="text-xs font-bold text-gray-500 uppercase mb-3 block">Тип узора</label>
+            <div className="flex gap-4 mb-8">
+              {[
+                { id: 'circle', icon: Circle, label: 'Круг' },
+                { id: 'honeycomb', icon: Hexagon, label: 'Соты' },
+                { id: 'triangle', icon: Triangle, label: 'Треуг.' }
+              ].map((item) => (
+                <button
+                  key={item.id}
+                  onClick={() => updatePerforation('shape', item.id as PerforationShape)}
+                  className={`flex-1 flex flex-col items-center justify-center gap-2 py-4 px-2 rounded-lg border transition-all ${config.perforation.shape === item.id
+                      ? 'bg-slate-700/80 border-blue-500 text-blue-400 shadow-lg shadow-blue-500/10'
+                      : 'bg-slate-800 border-slate-700 text-gray-400 hover:bg-slate-750 hover:border-slate-600'
+                    }`}
+                >
+                  <item.icon size={24} />
+                  <span className="text-sm font-medium">{item.label}</span>
+                </button>
+              ))}
+            </div>
+
+            {/* Resize Controls */}
+            <div className="space-y-6">
+              <div>
+                <div className="flex justify-between items-center mb-2">
+                  <label className="text-sm font-medium text-gray-300">Диаметр отверстий</label>
+                  <span className="text-sm font-bold text-blue-400">{config.perforation.size} мм</span>
+                </div>
+                <div className="flex items-center gap-4">
+                  <span className="text-xs text-gray-500">2 мм</span>
+                  <input
+                    type="range" min="2" max="25" step="1"
+                    value={config.perforation.size}
+                    onChange={(e) => updatePerforation('size', parseFloat(e.target.value))}
+                    className="flex-1 h-1.5 bg-slate-700 rounded-lg appearance-none cursor-pointer accent-blue-500"
+                  />
+                  <span className="text-xs text-gray-500">25 мм</span>
+                </div>
+              </div>
+
+              <div>
+                <div className="flex justify-between items-center mb-2">
+                  <label className="text-sm font-medium text-gray-300">Зазор (между отверстиями)</label>
+                  <span className="text-sm font-bold text-blue-400">{config.perforation.gap} мм</span>
+                </div>
+                <div className="flex items-center gap-4">
+                  <span className="text-xs text-gray-500">1 мм</span>
+                  <input
+                    type="range" min="1" max="10" step="0.5"
+                    value={config.perforation.gap}
+                    onChange={(e) => updatePerforation('gap', parseFloat(e.target.value))}
+                    className="flex-1 h-1.5 bg-slate-700 rounded-lg appearance-none cursor-pointer accent-blue-500"
+                  />
+                  <span className="text-xs text-gray-500">10 мм</span>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          {/* Preview */}
+          <div>
+            <label className="text-xs font-bold text-gray-500 uppercase mb-3 block">Предпросмотр</label>
+            <PerforationPreview config={config.perforation} />
+          </div>
+        </div>
+      </div>
+    </div>
   );
 };

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, Settings2 } from 'lucide-react';
-import { Grid, MousePointer2, Trash2, RotateCcw, X, Move, Settings, Plus } 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 --
+  // --- RAYCASTING (Поиск коробки для НОВОЙ стенки) ---
-  // Находит ближайшие стенки, чтобы ограничить новую перегородку
+  // Мы ищем ближайшие препятствия, чтобы определить границы новой стенки
-  const getHoveredBoundaries = (lx: number, ly: number, parts: Partition[]) => {
+  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?
-              // Проверяем, находится ли мышь в её диапазоне по Y
+              if (ly >= pMin - EPS && ly <= pMax + EPS) {
-              if (ly >= pMin && ly <= pMax) {
+                  // Стенка на нашем уровне. Слева или справа?
                   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?
-              // Проверяем, находится ли мышь в её диапазоне по X
+              if (lx >= pMin - EPS && lx <= pMax + EPS) {
-              if (lx >= pMin && lx <= pMax) {
+                  // Стенка на нашем уровне. Сверху или снизу?
                   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 };
   };
 
+  // Поиск соседей для размеров (Используем сохраненные данные)
+  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,
+      axis, offset, min, max,
-      offset,
+      height: config.drawer.height || 80, rounded: false
-      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') {
+        if (dragging.axis === 'x') newOffset = (nx - cellX1) / (cellX2 - cellX1);
-          newOffset = (nx - cellX1) / (cellX2 - cellX1);
+        else newOffset = (ny - cellY1) / (cellY2 - cellY1);
-        } 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) {
+        if (!closeToX && !closeToY) setPhantomMainAxis(Math.min(nx, 1-nx) < Math.min(ny, 1-ny) ? 'y' : 'x');
-          const distRight = 1 - nx; const distBottom = 1 - ny;
+        else setPhantomMainAxis(null);
-          setPhantomMainAxis(Math.min(nx, distRight) < Math.min(ny, distBottom) ? '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 };
+              cellIdx = { i, j }; break;
-              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,31 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
         if (found) {
           setHoveredPartition({ id: found.id, cellKey: key });
         } else {
-          // 3. Вычисляем T-образные границы
+          // --- FIND BOX USING RAYCASTING ---
-          const bounds = getHoveredBoundaries(lx, ly, parts);
+          const box = getCursorBox(lx, ly, parts);
           
-          const distL = lx - bounds.minX; 
+          const boxW = (box.maxX - box.minX) * realCellW;
-          const distR = bounds.maxX - lx;
+          const boxH = (box.maxY - box.minY) * realCellH;
-          const distT = ly - bounds.minY; 
-          const distB = bounds.maxY - ly;
 
-          const minX = Math.min(distL, distR);
+          // Default axis based on longest side
-          const minY = Math.min(distT, distB);
+          let newAxis: Axis = boxW > boxH ? 'x' : 'y';
 
-          // Определяем ось перпендикулярно ближайшей стороне
+          // Override if near edges
-          const axis = minX < minY ? 'y' : 'x'; 
+          const relL = (lx - box.minX) / (box.maxX - box.minX);
+          const relT = (ly - box.minY) / (box.maxY - box.minY);
+          const THRESHOLD = 0.2; // 20% zone near edges
 
-          // Проверяем, есть ли место
+          if (relL < THRESHOLD || relL > 1 - THRESHOLD) newAxis = 'x'; 
-          const width = bounds.maxX - bounds.minX;
+          else if (relT < THRESHOLD || relT > 1 - THRESHOLD) newAxis = 'y'; 
-          const height = bounds.maxY - bounds.minY;
 
-          if ((axis === 'y' && height > 0.1) || (axis === 'x' && width > 0.1)) {
+          // Validate space
-             const offset = axis === 'x' ? lx : ly;
+          const valid = (newAxis === 'x' && (box.maxX - box.minX) > 0.05) || (newAxis === 'y' && (box.maxY - box.minY) > 0.05);
-             const min = axis === 'x' ? bounds.minY : bounds.minX;
+          
-             const max = axis === 'x' ? bounds.maxY : bounds.maxX;
+          if (valid) {
-             setPhantomPartition({ axis, offset, min, max });
+             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 +265,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 +291,7 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
         }
       } else if (hoveredCell && phantomPartition) {
         if (e.button === 0) {
-          createPartition(
+          createPartition(hoveredCell.i, hoveredCell.j, phantomPartition.axis, phantomPartition.offset, phantomPartition.min, phantomPartition.max);
-              hoveredCell.i, 
-              hoveredCell.j, 
-              phantomPartition.axis, 
-              phantomPartition.offset,
-              phantomPartition.min,
-              phantomPartition.max
-          );
         }
       } else {
         setSelectedPartitionId(null);
@@ -300,6 +299,16 @@ export const LayoutStep: React.FC<Props> = ({ config, splits, onChange }) => {
     }
   };
 
+  // --- HANDLER: Clear Phantom on Leave ---
+  const handleMouseLeave = () => {
+      setDragging(null);
+      setPhantomMainAxis(null);
+      setHoveredMainSplit(null);
+      setHoveredCell(null);
+      setHoveredPartition(null);
+      setPhantomPartition(null);
+  };
+
   // --- RENDER ---
   const renderCellsAndPartitions = () => {
     const elements = [];
@@ -307,7 +316,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 +325,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,42 +348,73 @@ 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;
-              let lx1, ly1, lx2, ly2;
+              const pMax = p.max ?? 1;
+              if (pMax - pMin < 0.001) return null;
 
-              if (p.axis === 'x') {
+              let lx1, ly1, lx2, ly2;
+              let dist1 = 0, dist2 = 0;
+              let midX, midY;
+              const isVertical = 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); }}>
+                <g key={p.id}>
-                  <line x1={lx1} y1={ly1} x2={lx2} y2={ly2} stroke="transparent" strokeWidth="30" />
+                    <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>
               );
             })}
 
             {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;
+                        fx1 = px; fx2 = px; fy1 = cellY + (cellH * min); fy2 = cellY + (cellH * max);
-                        fy1 = cellY + (cellH * pMin); fy2 = cellY + (cellH * pMax);
                     } else {
                         const py = cellY + (cellH * phantomPartition.offset);
-                        fy1 = py; fy2 = py;
+                        fy1 = py; fy2 = py; fx1 = cellX + (cellW * min); fx2 = cellX + (cellW * max);
-                        fx1 = cellX + (cellW * pMin); fx2 = cellX + (cellW * pMax);
                     }
                     return <line x1={fx1} y1={fy1} x2={fx2} y2={fy2} stroke="#34d399" strokeWidth="3" strokeDasharray="6,6"/>;
                 })()}
@@ -373,143 +428,66 @@ 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">
+    <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">
-      {/* TOOLBAR */}
+          <div className="flex justify-between items-center p-3 border-b border-slate-800 bg-slate-900 z-10 shrink-0">
-      <div className="flex justify-between items-center mb-2 z-20 shrink-0">
+            <h2 className="text-sm font-bold flex items-center gap-2 text-primary"><Grid size={18} /> Редактор</h2>
-        <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); }} 
+                <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>
-                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'}`}>
+                <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>
-               <Move size={14}/> Границы
+            </div>
-            </button>
+            <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>
-            <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">
+          <div className="flex-1 bg-slate-800/30 flex items-center justify-center p-4 overflow-hidden relative">
-            <RotateCcw size={14} /> Сброс
+                <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') }}>   
-        </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} 
-                      onMouseMove={handleMouseMove} onMouseDown={handleMouseDown} onMouseUp={() => setDragging(null)} onMouseLeave={() => setDragging(null)} onContextMenu={(e) => e.preventDefault()}
+                        onMouseDown={handleMouseDown} 
+                        onMouseUp={() => setDragging(null)} 
+                        onMouseLeave={handleMouseLeave} // ДОБАВЛЕНО СЮДА
+                        onContextMenu={(e) => e.preventDefault()}
                    >
-                      <defs>
+                      <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>
-                          <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>
                       ))}
-
+                      {mode === 'lines' && !hoveredMainSplit && !dragging && phantomMainAxis && (
-                      {/* MAIN PHANTOMS */}
+                        <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"/>
-                      {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"/>}
                    </svg>
                 </div>
           </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>
 
+      {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">
-                        {/* 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>
-                        <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>
-                            <div className="flex justify-between text-xs text-gray-300 mb-2">
+                <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>
-                                <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}
+            <div className="mt-auto text-[10px] text-gray-500 text-center leading-relaxed">Выделите стенку для настройки.<br/>Двойной клик удаляет её.</div>
-                                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 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>
-    </div>
   );
 };

src/components/PreviewStep.tsx

@@ -1,9 +1,9 @@
 import React, { Suspense, useEffect, useRef, useState, useMemo } from 'react';
 import { Canvas } from '@react-three/fiber';
-import { OrbitControls, Center, Environment } from '@react-three/drei';
+import { OrbitControls, Center, Environment, Text } from '@react-three/drei';
 import * as THREE from 'three';
 import JSZip from 'jszip';
-import { AppConfig, GeneratedPart, LayoutSplits } from '../types';
+import { AppConfig, GeneratedPart, LayoutSplits, PerforationConfig } from '../types';
 import { createBinGeometry, generateSTL, exportSTL } from '../services/geometryGenerator';
 import { Download, Package, Info, Loader2, Share2, Check, Ruler } from 'lucide-react';
 import { generateShareUrl } from '../utils/share';
@@ -27,11 +27,12 @@ interface BinMeshProps {
     part: GeneratedPart;
     thickness: number;
     cornerRadius: number;
+    perforation: PerforationConfig;
     isSelected: boolean;
     onClick: () => void;
 }
 
-const BinMesh: React.FC<BinMeshProps> = ({ part, thickness, cornerRadius, isSelected, onClick }) => {
+const BinMesh: React.FC<BinMeshProps> = ({ part, thickness, cornerRadius, perforation, isSelected, onClick }) => {
     // 1. Создаем геометрию, учитывая ВНУТРЕННИЕ ПЕРЕГОРОДКИ
     const geometry = useMemo(() => {
         return createBinGeometry(
@@ -40,9 +41,10 @@ const BinMesh: React.FC<BinMeshProps> = ({ part, thickness, cornerRadius, isSele
             part.height,
             thickness,
             cornerRadius,
-        part.internalPartitions // <--- ВАЖНО: передаем перегородки в генератор
+            part.internalPartitions, // <--- ВАЖНО: передаем перегородки в генератор
+            perforation
         );
-  }, [part, thickness, cornerRadius]);
+    }, [part, thickness, cornerRadius, perforation]);
 
     // 2. Создаем контур выделения (EdgesGeometry)
     // Threshold 20 градусов скрывает линии на плавных скруглениях
@@ -50,18 +52,138 @@ const BinMesh: React.FC<BinMeshProps> = ({ part, thickness, cornerRadius, isSele
         return new THREE.EdgesGeometry(geometry, 20);
     }, [geometry]);
 
+    // 3. Вычисляем размеры и позиции для каждой под-ячейки
+    // 3. Вычисляем размеры и позиции для реальных отсеков (с учетом мерджинга)
+    const dimLabels = useMemo(() => {
+        const xOffsets = new Set<number>([0, 1]);
+        const zOffsets = new Set<number>([0, 1]);
+
+        part.internalPartitions.forEach(p => {
+            if (p.axis === 'x') xOffsets.add(p.offset);
+            if (p.axis === 'y') zOffsets.add(p.offset);
+        });
+
+        const xSplits = Array.from(xOffsets).sort((a, b) => a - b);
+        const zSplits = Array.from(zOffsets).sort((a, b) => a - b);
+
+        const numCols = xSplits.length - 1;
+        const numRows = zSplits.length - 1;
+        if (numCols === 0 || numRows === 0) return [];
+
+        // Union-Find для объединения ячеек, не разделенных стеной
+        const parent = new Int32Array(numCols * numRows).map((_, i) => i);
+        const find = (i: number): number => {
+            if (parent[i] === i) return i;
+            parent[i] = find(parent[i]);
+            return parent[i];
+        }
+        const union = (i: number, j: number) => {
+            const rootI = find(i);
+            const rootJ = find(j);
+            if (rootI !== rootJ) parent[rootJ] = rootI;
+        }
+        const getIdx = (c: number, r: number) => r * numCols + c;
+
+        // Вертикальные границы (X)
+        for (let i = 0; i < numCols - 1; i++) {
+            const boundaryX = xSplits[i + 1];
+            for (let j = 0; j < numRows; j++) {
+                const zMid = (zSplits[j] + zSplits[j + 1]) / 2;
+                // Проверяем наличие перегородки axis='x'
+                const isBlocked = part.internalPartitions.some(p =>
+                    p.axis === 'x' &&
+                    Math.abs(p.offset - boundaryX) < 0.001 &&
+                    (p.min ?? 0) <= zMid && (p.max ?? 1) >= zMid
+                );
+                if (!isBlocked) union(getIdx(i, j), getIdx(i + 1, j));
+            }
+        }
+
+        // Горизонтальные границы (Z/Y)
+        for (let j = 0; j < numRows - 1; j++) {
+            const boundaryZ = zSplits[j + 1];
+            for (let i = 0; i < numCols; i++) {
+                const xMid = (xSplits[i] + xSplits[i + 1]) / 2;
+                // Проверяем наличие перегородки axis='y'
+                const isBlocked = part.internalPartitions.some(p =>
+                    p.axis === 'y' &&
+                    Math.abs(p.offset - boundaryZ) < 0.001 &&
+                    (p.min ?? 0) <= xMid && (p.max ?? 1) >= xMid
+                );
+                if (!isBlocked) union(getIdx(i, j), getIdx(i, j + 1));
+            }
+        }
+
+        // Агрегируем регионы
+        const regions: Record<number, { minC: number, maxC: number, minR: number, maxR: number }> = {};
+        for (let j = 0; j < numRows; j++) {
+            for (let i = 0; i < numCols; i++) {
+                const root = find(getIdx(i, j));
+                if (!regions[root]) regions[root] = { minC: i, maxC: i, minR: j, maxR: j };
+                else {
+                    const r = regions[root];
+                    r.minC = Math.min(r.minC, i);
+                    r.maxC = Math.max(r.maxC, i);
+                    r.minR = Math.min(r.minR, j);
+                    r.maxR = Math.max(r.maxR, j);
+                }
+            }
+        }
+
+        return Object.values(regions).map((r, idx) => {
+            const fXStart = xSplits[r.minC];
+            const fXEnd = xSplits[r.maxC + 1];
+            const fZStart = zSplits[r.minR];
+            const fZEnd = zSplits[r.maxR + 1];
+
+            const fracW = fXEnd - fXStart;
+            const fracD = fZEnd - fZStart;
+
+            const dimX = Math.max(0, fracW * (part.width - thickness) - thickness);
+            const dimZ = Math.max(0, fracD * (part.depth - thickness) - thickness);
+
+            const cx = -part.width / 2 + (fXStart + fXEnd) / 2 * part.width;
+            const cz = -part.depth / 2 + (fZStart + fZEnd) / 2 * part.depth;
+
+            return {
+                key: `region-${idx}`,
+                pos: [cx, thickness + 0.2, cz] as [number, number, number],
+                text: `${dimX.toFixed(0)} x ${dimZ.toFixed(0)}`
+            };
+        });
+    }, [part, thickness]);
+
     return (
-    <group position={[part.x + part.width/2, 0, part.y + part.depth/2]}>
+        <group
+            position={[part.x + part.width / 2, 0, part.y + part.depth / 2]}
+            onClick={(e) => { e.stopPropagation(); onClick(); }}
+        >
             {/* Сама модель */}
-       <mesh geometry={geometry} onClick={(e) => { e.stopPropagation(); onClick(); }}>
+            <mesh geometry={geometry}>
                 <meshStandardMaterial
                     color={isSelected ? '#f59e0b' : part.color}
                     roughness={0.5}
                     metalness={0.1}
-            side={THREE.DoubleSide} // Рисуем обе стороны стенок
+                    side={THREE.DoubleSide}
                 />
             </mesh>
 
+            {/* Текстовые метки размеров внутри каждой ячейки */}
+            {dimLabels.map(label => (
+                <Text
+                    key={label.key}
+                    position={label.pos}
+                    rotation={[-Math.PI / 2, 0, 0]}
+                    fontSize={Math.min(part.width, part.depth) * 0.035}
+                    color="#1e293b"
+                    anchorX="center"
+                    anchorY="middle"
+                    characters="0123456789x "
+                >
+                    {label.text}
+                </Text>
+            ))}
+
             {/* Белая подсветка при выборе */}
             {isSelected && (
                 <lineSegments geometry={edgesGeometry}>
@@ -100,7 +222,8 @@ export const PreviewStep: React.FC<Props> = ({ parts, config, splits }) => {
             part.height,
             config.wallThickness,
             config.cornerRadius,
-        part.internalPartitions // <--- ВАЖНО для STL
+            part.internalPartitions, // <--- ВАЖНО для STL
+            config.perforation
         );
         const mesh = new THREE.Mesh(geometry, new THREE.MeshStandardMaterial());
         exportSTL(mesh, `${part.name.replace(/\s+/g, '_')}.stl`);
@@ -119,7 +242,8 @@ export const PreviewStep: React.FC<Props> = ({ parts, config, splits }) => {
                     part.height,
                     config.wallThickness,
                     config.cornerRadius,
-                part.internalPartitions // <--- ВАЖНО для STL
+                    part.internalPartitions, // <--- ВАЖНО для STL
+                    config.perforation
                 );
                 const mesh = new THREE.Mesh(geometry, new THREE.MeshStandardMaterial());
                 const stlData = generateSTL(mesh);
@@ -251,6 +375,7 @@ export const PreviewStep: React.FC<Props> = ({ parts, config, splits }) => {
                                             part={part}
                                             thickness={config.wallThickness}
                                             cornerRadius={config.cornerRadius || 0}
+                                            perforation={config.perforation}
                                             isSelected={selectedId === part.id}
                                             onClick={() => setSelectedId(part.id)}
                                         />

src/services/geometryGenerator.ts

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 import { STLExporter, mergeBufferGeometries } from 'three-stdlib';
-import { AppConfig, LayoutSplits, GeneratedPart, Partition } from '../types';
+import { AppConfig, LayoutSplits, GeneratedPart, Partition, PerforationConfig } from '../types';
 
 export const calculateParts = (config: AppConfig, splits: LayoutSplits): GeneratedPart[] => {
     const parts: GeneratedPart[] = [];
@@ -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,61 +74,479 @@ const createRoundedRectShape = (width: number, height: number, radius: number):
     return shape;
 };
 
-// 2. Форма галтели (вогнутого треугольника) для углов
+const createConcaveFilletShape = (radius: number): THREE.Shape => {
-const createFilletShape = (radius: number): THREE.Shape => {
     const shape = new THREE.Shape();
-    // Начинаем из угла (0,0)
     shape.moveTo(0, 0);
-    // Линия вдоль одной стенки
     shape.lineTo(radius, 0);
-    // Вогнутая дуга к другой стенке
+    shape.absarc(radius, radius, radius, -Math.PI / 2, -Math.PI, true);
-    // Центр окружности (radius, radius), радиус radius.
-    // Рисуем дугу от 270 (-PI/2) до 180 (PI) градусов по часовой стрелке
-    shape.absarc(radius, radius, radius, 1.5 * Math.PI, Math.PI, true);
-    // Замыкаем в угол
     shape.lineTo(0, 0);
-    
     return shape;
 };
 
+// New Helper: Create Perforated Plate (Vertical Wall)
+const createPerforatedPlate = (
+    width: number,
+    height: number,
+    thickness: number,
+    perf: PerforationConfig,
+    marginLeft: number = 0,
+    marginRight: number = 0,
+    exclusions: { start: number, end: number, yMax?: number }[] = []
+): THREE.BufferGeometry => {
+    const shape = new THREE.Shape();
+    shape.moveTo(0, 0);
+    shape.lineTo(width, 0);
+    shape.lineTo(width, height);
+    shape.lineTo(0, height);
+    shape.lineTo(0, 0);
+
+    // Hole Generation
+    if (perf && perf.enabled && width > perf.size && height > perf.size) {
+        const { shape: shapeType, size, gap } = perf;
+        const step = size + gap;
+        // Margins: ensure holes don't cut into the solid edge zones
+        const startX = Math.max(gap, marginLeft + gap);
+        const startY = gap;
+        const endX = width - Math.max(gap, marginRight + gap);
+        const endY = height - gap;
+
+        // Rows
+        let row = 0;
+        for (let y = startY + size / 2; y < endY; y += (shapeType === 'triangle' || shapeType === 'honeycomb' ? step * 0.866 : step)) {
+            const isStaggered = (row % 2 !== 0);
+            const xOffset = (isStaggered && (shapeType === 'honeycomb' || shapeType === 'triangle')) ? step / 2 : 0;
+
+            for (let x = startX + size / 2 + xOffset; x < endX; x += step) {
+                const hole = new THREE.Path();
+                const r = size / 2;
+
+                // Boundary check
+                if (x - r < marginLeft || x + r > width - marginRight || y - r < 0 || y + r > height) continue;
+
+                // Exclusion Zone Check
+                // Zone active if hole X is within [start, end] AND hole Y is below yMax (if specified).
+                // If y > yMax, the exclusion doesn't apply (it's above the intersecting wall).
+                // Note: y is measured from bottom (0) to top (height).
+                // yMax is the height of the intersecting partition.
+
+                const inExclusion = exclusions.some(zone => {
+                    if (x + r <= zone.start || x - r >= zone.end) return false; // X-axis check
+                    if (zone.yMax !== undefined && y - r > zone.yMax) return false; // Y-axis check (hole above wall)
+                    return true;
+                });
+
+                if (inExclusion) continue;
+
+                if (shapeType === 'circle') {
+                    hole.absarc(x, y, r, 0, Math.PI * 2, true);
+                } else if (shapeType === 'honeycomb') {
+                    // Hexagon
+                    for (let i = 0; i < 6; i++) {
+                        const ang = (i * 60 + 30) * Math.PI / 180;
+                        const px = x + r * Math.cos(ang);
+                        const py = y + r * Math.sin(ang);
+                        if (i === 0) hole.moveTo(px, py);
+                        else hole.lineTo(px, py);
+                    }
+                    hole.closePath();
+                } else if (shapeType === 'triangle') {
+                    // Triangle
+                    const ang1 = -90 * Math.PI / 180;
+                    const ang2 = 30 * Math.PI / 180;
+                    const ang3 = 150 * Math.PI / 180;
+                    hole.moveTo(x + r * Math.cos(ang1), y + r * Math.sin(ang1));
+                    hole.lineTo(x + r * Math.cos(ang2), y + r * Math.sin(ang2));
+                    hole.lineTo(x + r * Math.cos(ang3), y + r * Math.sin(ang3));
+                    hole.closePath();
+                }
+                shape.holes.push(hole);
+            }
+            row++;
+        }
+    }
+
+    const geo = new THREE.ExtrudeGeometry(shape, { depth: thickness, bevelEnabled: false });
+    // Extruded along Z. Wall is flat on XY.
+    // We want "thickness" to be Z depth.
+    return geo;
+};
+
+// New Helper: Create Corner Profile (Extruded Vertical)
+const createCornerProfile = (radius: number, thickness: number, height: number): THREE.BufferGeometry => {
+    if (radius <= 0) return new THREE.BufferGeometry();
+    const shape = new THREE.Shape();
+
+    // Create a Ring Segment (Hollow Corner) as a single loop.
+    // Center at (0,0).
+    const innerRadius = Math.max(0.01, radius - thickness); // Ensure slightly > 0 to maintain shape integrity
+
+    // 1. Start at Outer Start
+    shape.moveTo(radius, 0);
+
+    // 2. Outer Arc (CCW) -> To (0, radius)
+    shape.absarc(0, 0, radius, 0, Math.PI / 2, false);
+
+    // 3. Line to Inner End (0, innerRadius)
+    shape.lineTo(0, innerRadius);
+
+    // 4. Inner Arc (CW) -> To (innerRadius, 0)
+    shape.absarc(0, 0, innerRadius, Math.PI / 2, 0, true);
+
+    // 5. Close loop
+    shape.lineTo(radius, 0);
+
+    // Extrude
+    // curveSegments 32 for smoothness
+    const geo = new THREE.ExtrudeGeometry(shape, { depth: height, bevelEnabled: false, curveSegments: 32 });
+    return geo;
+};
+
 export const createBinGeometry = (
-  width: number, depth: number, height: number, thickness: number, radius: number = 0, partitions: Partition[] = []
+    width: number,
+    depth: number,
+    height: number,
+    thickness: number,
+    radius: number = 0,
+    partitions: Partition[] = [],
+    perforation?: PerforationConfig
 ): THREE.BufferGeometry => {
     const geometries: THREE.BufferGeometry[] = [];
 
-  // ДНО
+    // ДНО (Floor) - Always same
     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);
+    floorGeo.rotateX(-Math.PI / 2); // Lay flat
     geometries.push(floorGeo);
 
-  // ВНЕШНИЕ СТЕНКИ
+    // WALLS
+    if (!perforation || !perforation.enabled) {
+        // --- ORIGINAL LOGIC (Optimized for Solid Walls) ---
         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);
+    } else {
+        // --- PERFORATED LOGIC (Split Walls) ---
+        const wallHeight = height - thickness;
+        // Clamp radius to at least thickness for valid corners in this mode
+        const effRadius = Math.max(radius, thickness);
+
+        const straightW = width - 2 * effRadius;
+        const straightD = depth - 2 * effRadius;
+
+        // 1. Corners (4 pcs)
+        if (effRadius > 0) {
+            const cornerGeoBase = createCornerProfile(effRadius, thickness, wallHeight);
+
+            // 1. Stand Up: Extrusion Z -> Y. Shape moves to X(+)/Z(+).
+            cornerGeoBase.rotateX(-Math.PI / 2);
+
+            // Base Corner Shape (after rotateX) is Q4 (+X, -Z).
+            // Rotation Logic: -90 degrees per Quadrant (Standard Three.js Y-Rot).
+            // Q4 (0) -> Q1 (-90) -> Q2 (-180/180) -> Q3 (-270/+90).
+
+            const positions = [
+                // Back Right (+X, +Z). Q1.
+                // Rot -90 (-PI/2).
+                { x: width / 2 - effRadius, z: depth / 2 - effRadius, rot: -Math.PI / 2 },
+
+                // Back Left (-X, +Z). Q2.
+                // Rot 180 (PI).
+                { x: -(width / 2 - effRadius), z: depth / 2 - effRadius, rot: Math.PI },
+
+                // Front Left (-X, -Z). Q3.
+                // Rot 90 (PI/2). (Equivalent to -270).
+                { x: -(width / 2 - effRadius), z: -(depth / 2 - effRadius), rot: Math.PI / 2 },
+
+                // Front Right (+X, -Z). Q4.
+                // Rot 0.
+                { x: width / 2 - effRadius, z: -(depth / 2 - effRadius), rot: 0 }
+            ];
+
+            positions.forEach(pos => {
+                const corner = cornerGeoBase.clone();
+                corner.rotateY(pos.rot);
+                corner.translate(pos.x, 0, pos.z); // Start at Y=0
+                corner.translate(0, thickness, 0); // Move on top of floor
+                geometries.push(corner);
+            });
+        }
+
+        // 2. Straight Walls (4 pcs) - Centered on edges
+
+        // REWRITE EXCLUSION COLLECTION LOGIC TO BE WALL-SPECIFIC
+        const exclusionsBack: { start: number, end: number, yMax: number }[] = [];
+        const exclusionsFront: { start: number, end: number, yMax: number }[] = [];
+        const exclusionsLeft: { start: number, end: number, yMax: number }[] = [];
+        const exclusionsRight: { start: number, end: number, yMax: number }[] = [];
+
+        // Inner Dimensions
+        const effectiveInnerW = width - 2 * thickness;
+        const effectiveInnerD = depth - 2 * thickness;
+
+        partitions.forEach(p => {
+            const hEff = Math.max(0.1, p.height - thickness); // Exclude only up to partition height
+            // Ensure solid strip around partition by adding padding to exclusion zone
+            const padding = (perforation?.gap ?? 2) + 1;
+
+            if (p.axis === 'x') {
+                // Runs Depth-wise (Y axis in Layout).
+                // Intersects Front and Back walls.
+
+                const partGlobalX = (-effectiveInnerW / 2) + (effectiveInnerW * p.offset);
+                const sW = width - 2 * effRadius;
+                const localXOnWall = partGlobalX + sW / 2;
+
+                // Check intersection with active straight wall area + padding
+                if (localXOnWall + thickness / 2 + padding > 0 && localXOnWall - thickness / 2 - padding < sW) {
+                    const zone = {
+                        start: localXOnWall - thickness / 2 - padding,
+                        end: localXOnWall + thickness / 2 + padding,
+                        yMax: hEff
+                    };
+
+                    if ((p.max ?? 1) > 0.99) exclusionsFront.push(zone); // Near
+                    if ((p.min ?? 0) < 0.01) exclusionsBack.push(zone);  // Far
+                }
+
+            } else { // p.axis === 'y'
+                // Runs Width-wise (X axis in Layout).
+                // Intersects Left and Right walls.
+
+                const partGlobalZ = (-effectiveInnerD / 2) + (effectiveInnerD * p.offset);
+                const sD = depth - 2 * effRadius;
+                const localXOnWall = partGlobalZ + sD / 2;
+
+                if (localXOnWall + thickness / 2 + padding > 0 && localXOnWall - thickness / 2 - padding < sD) {
+                    const zone = {
+                        start: localXOnWall - thickness / 2 - padding,
+                        end: localXOnWall + thickness / 2 + padding,
+                        yMax: hEff
+                    };
+
+                    if ((p.min ?? 0) < 0.01) {
+                        exclusionsLeft.push(zone);
+                    }
+                    if ((p.max ?? 1) > 0.99) {
+                        exclusionsRight.push(zone);
+                    }
+                }
+            }
+        });
+
+        // Front/Back
+        if (straightW > 0.1) {
+            // Wall 1 (at +Z). This is "Front" (Near). Contacts p.max.
+            // Uses exclusionsFront.
+            const wGeoFront = createPerforatedPlate(straightW, wallHeight, thickness, perforation, 0, 0, exclusionsFront);
+            wGeoFront.translate(-straightW / 2, 0, 0);
+            const w1 = wGeoFront.clone();
+            w1.translate(0, thickness, depth / 2 - thickness);
+            geometries.push(w1);
+
+            // Wall 2 (at -Z). This is "Back" (Far). Contacts p.min.
+            // Uses exclusionsBack.
+            // Needs checking mapping (Rot 180).
+            // p.offset increases X. Wall rotated 180 means X is inverted.
+            // So we map exclusionsBack.
+            const exclusionsBackMapped = exclusionsBack.map(e => ({
+                start: straightW - e.end,
+                end: straightW - e.start,
+                yMax: e.yMax
+            }));
+
+            const wGeoBack = createPerforatedPlate(straightW, wallHeight, thickness, perforation, 0, 0, exclusionsBackMapped);
+            wGeoBack.translate(-straightW / 2, 0, 0);
+            const w2 = wGeoBack.clone();
+            w2.rotateY(Math.PI);
+            w2.translate(0, thickness, -(depth / 2 - thickness));
+            geometries.push(w2);
+        }
+
+        // Left/Right
+        if (straightD > 0.1) {
+            // Wall 3 (Right? +X).
+            // Plate is 0..straightD in X, 0..wallHeight in Y. Thickness along Z.
+            // We want it to be at X = width/2.
+            // It needs to be rotated -PI/2 around Y to align its X-axis with World Z-axis.
+            // After rotateY(-PI/2): Plate X (0..straightD) becomes World Z (0..straightD).
+            // Plate Z (thickness) becomes World -X (towards Left).
+            // So if we place it at X=width/2, it extrudes to width/2 - thickness. Correct for Right Wall.
+            const wGeoRight = createPerforatedPlate(straightD, wallHeight, thickness, perforation, 0, 0, exclusionsRight);
+            wGeoRight.translate(-straightD / 2, 0, 0); // Center X of plate
+            const w3 = wGeoRight.clone();
+            w3.rotateY(-Math.PI / 2); // Rotate to align with Z-axis
+            w3.translate(width / 2, thickness, 0); // Position at X=width/2
+            geometries.push(w3);
+
+            // Wall 4 (Left? -X).
+            // This wall is also rotated PI/2.
+            // Plate Z (thickness) becomes World X (towards Right).
+            // We want it at X=-width/2.
+            // It will extrude to -width/2 + thickness. Correct for Left Wall.
+            const exclusionsLeftMapped = exclusionsLeft.map(e => ({
+                start: straightD - e.end,
+                end: straightD - e.start,
+                yMax: e.yMax
+            }));
+
+            const wGeoLeft = createPerforatedPlate(straightD, wallHeight, thickness, perforation, 0, 0, exclusionsLeftMapped);
+            wGeoLeft.translate(-straightD / 2, 0, 0); // Center X of plate
+            const w4 = wGeoLeft.clone();
+            w4.rotateY(Math.PI / 2);
+            w4.translate(-width / 2, thickness, 0); // Position at X=-width/2
+            geometries.push(w4);
+        }
+    }
+
+
+    // ВНУТРЕННИЕ ПЕРЕГОРОДКИ
+    const innerWidth = width - (2 * thickness);
+    const innerDepth = depth - (2 * thickness); // Approximate usable space logic
 
-  // ВНУТРЕННИЕ ПЕРЕГОРОДКИ И СКРУГЛЕНИЯ
     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; 
+        // FIX: Subtract thickness because partitions sit ON TOP of the floor
+        const effectiveHeight = Math.max(0.1, p.height - thickness);
 
-      // Размеры самой стенки
+        // --- PERFORATED LOGIC FOR PARTITIONS ---
+        // If enabled, use Plate. Else use Extrude Solid.
+        const usePerf = perforation && perforation.enabled;
+        let pX = 0, pY = 0; // Declare here for visibility in Fillets
+
+        if (usePerf) {
+            // Calculate exact geometry
+            let pLen = 0;
+
+            if (p.axis === 'x') {
+                // Axis X -> Divider runs along Y (Depth)
+                pLen = lengthRatio * innerDepth;
+                pX = (-innerWidth / 2) + (innerWidth * p.offset);
+                pY = (-innerDepth / 2) + (innerDepth * midRatio); // Center of partition
+
+                // Calculate Exclusions for Internal Partition
+                const partExclusions: { start: number, end: number, yMax?: number }[] = [];
+                // This partition is 'p' (Axis X, runs along Depth).
+                // Intersected by partitions 'n' (Axis Y, runs along Width).
+                // p global Y range: pY - pLen/2 to pY + pLen/2.
+                // n global Y pos: (-innerDepth/2) + (innerDepth * n.offset).
+
+                partitions.forEach(n => {
+                    if (n.axis !== 'y') return; // Only orthogonal partitions intersect
+                    // Check if n intersects p
+                    // Intersection Y location:
+                    const nY = (-innerDepth / 2) + (innerDepth * n.offset);
+
+                    // Does nY (which is global Y of the intersecting partition) match p's position?
+                    // p is Axis X, runs along DEPTH (Global Y).
+                    // p is centered at pX (Width) and covers pLen in Depth (Y).
+                    // Wait. p (Axis X) runs along Y? 
+                    // p.axis='x' -> "Runs along Y (Depth)". Correct.
+                    // So p covers Y range [pY - pLen/2, pY + pLen/2].
+                    // n is Axis Y, runs along X (Width).
+                    // n is centered at nY (Depth).
+                    // So intersection happens if nY is within p's Y range.
+
+                    const pStartGlobal = pY - pLen / 2;
+                    const pEndGlobal = pY + pLen / 2;
+
+                    // And check if n covers p's X location.
+                    // n runs along X from nMin to nMax.
+                    const nXStart = (-innerWidth / 2) + (innerWidth * (n.min ?? 0));
+                    const nXEnd = (-innerWidth / 2) + (innerWidth * (n.max ?? 1));
+                    const pXLoc = pX;
+
+                    if (nY >= pStartGlobal && nY <= pEndGlobal && pXLoc >= nXStart && pXLoc <= nXEnd) {
+                        // Intersection confirmed.
+                        // Calculate local coord on p's plate.
+                        // p runs along Y. Plate local X maps to Global Y.
+                        // local = global - pY + pLen/2.
+                        const nHeight = Math.max(0.1, n.height - thickness);
+                        const localX = nY - pY + pLen / 2;
+                        partExclusions.push({ start: localX - thickness / 2, end: localX + thickness / 2, yMax: nHeight });
+                    }
+                });
+
+                // Add margins (solid ends)
+                const margin = thickness;
+                const plate = createPerforatedPlate(pLen, effectiveHeight, thickness, perforation!, margin, margin, partExclusions);
+                plate.translate(-pLen / 2, 0, 0); // Center X
+
+                // Rotate to align with Depth (along Z)
+                // Plate X -> Z
+                plate.rotateY(-Math.PI / 2);
+
+                // Position
+                // Plate is now vertical Z-aligned. Thickness along X.
+                plate.translate(pX + thickness / 2, thickness, pY);
+                geometries.push(plate);
+
+            } else {
+                // Axis Y -> Divider runs along X (Width)
+                pLen = lengthRatio * innerWidth;
+                pX = (-innerWidth / 2) + (innerWidth * midRatio);
+                pY = (-innerDepth / 2) + (innerDepth * p.offset);
+
+                // Calculate Exclusions
+                const partExclusions: { start: number, end: number, yMax?: number }[] = [];
+                // This partition is 'p' (Axis Y, runs along Width).
+                // Intersected by partitions 'n' (Axis X, runs along Depth).
+
+                partitions.forEach(n => {
+                    if (n.axis !== 'x') return;
+                    const nX = (-innerWidth / 2) + (innerWidth * n.offset);
+
+                    const pStartGlobal = pX - pLen / 2; // X range of p
+                    const pEndGlobal = pX + pLen / 2;
+
+                    const nYStart = (-innerDepth / 2) + (innerDepth * (n.min ?? 0));
+                    const nYEnd = (-innerDepth / 2) + (innerDepth * (n.max ?? 1));
+                    const pYLoc = pY;
+
+                    if (nX >= pStartGlobal && nX <= pEndGlobal && pYLoc >= nYStart && pYLoc <= nYEnd) {
+                        // Intersection confirmed
+                        // local = global - pX + pLen/2
+                        const nHeight = Math.max(0.1, n.height - thickness); // INTERSECTING PARTITION HEIGHT
+                        const localX = nX - pX + pLen / 2;
+                        partExclusions.push({ start: localX - thickness / 2, end: localX + thickness / 2, yMax: nHeight });
+                    }
+                });
+
+                const margin = thickness;
+                const plate = createPerforatedPlate(pLen, effectiveHeight, thickness, perforation!, margin, margin, partExclusions);
+                plate.translate(-pLen / 2, 0, 0); // Center X
+
+                // Already aligned with X. Thickness along Z.
+                // Z range [0, th]. We want [-th/2, th/2] relative to pY.
+                // Translate Z by -th/2.
+                plate.translate(0, 0, -thickness / 2);
+
+                // Move to position
+                plate.translate(pX, thickness, pY);
+                geometries.push(plate);
+            }
+
+        } else {
+            // --- SOLID LOGIC ---
+            let pWidth = 0, pDepth = 0;
             if (p.axis === 'x') {
                 pWidth = thickness;
                 pDepth = lengthRatio * innerDepth;
@@ -142,71 +559,62 @@ export const createBinGeometry = (
                 pY = (-innerDepth / 2) + (innerDepth * p.offset);
             }
 
-      // Создаем стенку
+            const partShape = createRoundedRectShape(pWidth, pDepth, 0.1);
-      const partShape = createRoundedRectShape(pWidth, pDepth, 0.1); // Чуть-чуть скругляем саму стенку, чтобы не была острой
+            const partGeo = new THREE.ExtrudeGeometry(partShape, { depth: effectiveHeight, bevelEnabled: false });
-      const partGeo = new THREE.ExtrudeGeometry(partShape, { depth: p.height, bevelEnabled: false, curveSegments: 2 });
             partGeo.rotateX(-Math.PI / 2);
             partGeo.translate(pX, thickness, pY);
             geometries.push(partGeo);
+        }
 
-      // --- ДОБАВЛЕНИЕ ГАЛТЕЛЕЙ (FILLETS) ---
+        // Fillets Logic for partitions (Keep solid for strength/aesthetics)
-      if (p.rounded && radius > 0.5) {
+        if (p.rounded && radius > 1) {
-          // Радиус скругления такой же, как у углов ящика, но не больше разумного предела
+            const filletR = Math.min(radius, 5);
-          const filletR = Math.min(radius, 6); 
+            const filletShape = createConcaveFilletShape(filletR);
-          const filletShape = createFilletShape(filletR);
-          const filletExtrudeSettings = { depth: p.height, bevelEnabled: false, curveSegments: 8 };
 
-          // Функция для создания и позиционирования одной галтели
+            // Helper to get neighbor height
-          const addFillet = (x: number, y: number, rotation: number) => {
+            const getNeighborHeight = (pos: number) => {
-              const geo = new THREE.ExtrudeGeometry(filletShape, filletExtrudeSettings);
+                if (pos < 0.001 || pos > 0.999) return height;
-              geo.rotateX(-Math.PI / 2); // Положить на пол
+                const neighbor = partitions.find(n => {
-              geo.rotateY(rotation);     // Повернуть в нужный угол
+                    if (n.axis === p.axis) return false;
+                    const nMin = n.min ?? 0;
+                    const nMax = n.max ?? 1;
+                    if (Math.abs(n.offset - pos) > 0.002) return false;
+                    return p.offset > nMin && p.offset < nMax;
+                });
+                return neighbor ? neighbor.height : 0;
+            };
 
-              // Корректировка позиции после вращения вокруг (0,0)
+            const hStart = Math.min(p.height, getNeighborHeight(pMin));
-              // Нам нужно сместить так, чтобы угол (0,0) галтели совпал с углом стыка
+            const hEnd = Math.min(p.height, getNeighborHeight(pMax));
+
+            const addFillet = (x: number, y: number, rotY: number, h: number) => {
+                const hEff = Math.max(0.1, h - thickness);
+                if (hEff <= 1) return;
+                const geo = new THREE.ExtrudeGeometry(filletShape, { depth: hEff, bevelEnabled: false });
+                geo.rotateX(-Math.PI / 2);
+                geo.rotateY(rotY);
                 geo.translate(x, thickness, y);
                 geometries.push(geo);
             };
 
-          const halfThick = thickness / 2;
+            const t = thickness / 2;
 
             if (p.axis === 'x') {
-              // Вертикальная стенка. Концы: Top (pMin) и Bottom (pMax) (в 2D координатах Y)
+                const topY = (-innerDepth / 2) + (innerDepth * pMin);
-              // Y координата начала: -innerDepth/2 + innerDepth * pMin
+                const botY = (-innerDepth / 2) + (innerDepth * pMax);
-              // Y координата конца: -innerDepth/2 + innerDepth * pMax
-              // X координата центра: pX
 
-              const startY = (-innerDepth / 2) + (innerDepth * pMin);
+                addFillet(pX - t, topY, Math.PI, hStart);
-              const endY = (-innerDepth / 2) + (innerDepth * pMax);
+                addFillet(pX + t, topY, -Math.PI / 2, hStart);
-
+                addFillet(pX - t, botY, Math.PI / 2, hEnd);
-              // 4 Угла:
+                addFillet(pX + t, botY, 0, hEnd);
-              // 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
             } else {
-              // Горизонтальная стенка
+                const leftX = (-innerWidth / 2) + (innerWidth * pMin);
-              const startX = (-innerWidth / 2) + (innerWidth * pMin);
+                const rightX = (-innerWidth / 2) + (innerWidth * pMax);
-              const endX = (-innerWidth / 2) + (innerWidth * pMax);
 
-              // Min End (Left side):
+                addFillet(leftX, pY - t, 0, hStart);
-              addFillet(startX, pY + halfThick, -Math.PI/2);
+                addFillet(leftX, pY + t, -Math.PI / 2, hStart);
-              addFillet(startX, pY - halfThick, 0);
+                addFillet(rightX, pY - t, Math.PI / 2, hEnd);
-
+                addFillet(rightX, pY + t, Math.PI, hEnd);
-              // Max End (Right side):
-              addFillet(endX, pY + halfThick, Math.PI);
-              addFillet(endX, pY - halfThick, Math.PI/2);
             }
         }
     });
@@ -225,7 +633,7 @@ export const generateSTL = (mesh: THREE.Object3D): Uint8Array | string => {
 
 export const exportSTL = (mesh: THREE.Object3D, filename: string) => {
     const result = generateSTL(mesh);
-    const blob = new Blob([result], { type: 'application/octet-stream' });
+    const blob = new Blob([result as any], { type: 'application/octet-stream' });
     const link = document.createElement('a');
     link.href = URL.createObjectURL(blob);
     link.download = filename;

src/types.ts

@@ -9,6 +9,16 @@ export interface AppConfig {
   wallThickness: number;
   printerTolerance: number;
   cornerRadius: number;
+  perforation: PerforationConfig;
+}
+
+export type PerforationShape = 'circle' | 'honeycomb' | 'triangle' | 'diamond';
+
+export interface PerforationConfig {
+  enabled: boolean;
+  shape: PerforationShape;
+  size: number;
+  gap: number;
 }
 
 export interface Partition {