From a4dcc62a37a106caca29025af47906b4b4342791 Mon Sep 17 00:00:00 2001
From: poignatov <poignatov@avito.ru>
Date: Sun, 15 Mar 2026 19:55:50 +0300
Subject: [PATCH] =?UTF-8?q?6.18.3:=20=D0=A4=D0=B8=D0=BA=D1=81=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D0=B0=D1=8F=20=D0=BA=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=BA=D0=B0=20=D0=9D=D0=B0=D1=87=D0=B0=D1=82=D1=8C/?=
 =?UTF-8?q?=D0=97=D0=B0=D0=B2=D0=B5=D1=80=D1=88=D0=B8=D1=82=D1=8C=20=D0=B2?=
 =?UTF-8?q?=20=D1=82=D0=B5=D1=81=D1=82=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VERSION                                    |  2 +-
 play-life-web/package.json                 |  2 +-
 play-life-web/src/App.jsx                  |  1 +
 play-life-web/src/components/TaskList.jsx  |  2 +-
 play-life-web/src/components/TestWords.jsx | 55 ++++++++++++++++------
 5 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/VERSION b/VERSION
index ab1d615..2e49270 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.18.2
+6.18.3
diff --git a/play-life-web/package.json b/play-life-web/package.json
index 57ec795..efc0896 100644
--- a/play-life-web/package.json
+++ b/play-life-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "play-life-web",
-  "version": "6.18.2",
+  "version": "6.18.3",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/play-life-web/src/App.jsx b/play-life-web/src/App.jsx
index c16f74c..c3a85b8 100644
--- a/play-life-web/src/App.jsx
+++ b/play-life-web/src/App.jsx
@@ -1309,6 +1309,7 @@ function AppContent() {
                 configId={tabParams.configId}
                 maxCards={tabParams.maxCards}
                 taskId={tabParams.taskId}
+                isActive={activeTab === 'test'}
               />
             </div>
           </div>
diff --git a/play-life-web/src/components/TaskList.jsx b/play-life-web/src/components/TaskList.jsx
index 909b338..18744be 100644
--- a/play-life-web/src/components/TaskList.jsx
+++ b/play-life-web/src/components/TaskList.jsx
@@ -925,7 +925,7 @@ function TaskList({ onNavigate, data, loading, backgroundLoading, error, onRetry
                 {task.name}
                 {hasSubtasks && (
                   <span className="task-subtasks-count">
-                    {task.draft_subtasks_count != null
+                    {task.draft_subtasks_count != null && task.draft_subtasks_count > 0
                       ? `(${task.draft_subtasks_count}/${task.subtasks_count})`
                       : `(${task.subtasks_count})`}
                   </span>
diff --git a/play-life-web/src/components/TestWords.jsx b/play-life-web/src/components/TestWords.jsx
index 2c46e85..acd7ca8 100644
--- a/play-life-web/src/components/TestWords.jsx
+++ b/play-life-web/src/components/TestWords.jsx
@@ -1,4 +1,5 @@
 import React, { useState, useEffect, useRef, useCallback } from 'react'
+import { createPortal } from 'react-dom'
 import { useAuth } from './auth/AuthContext'
 import LoadingError from './LoadingError'
 import './TestWords.css'
@@ -8,7 +9,7 @@ const API_URL = '/api'
 
 const DEFAULT_TEST_WORD_COUNT = 10
 
-function TestWords({ onNavigate, wordCount: initialWordCount, configId: initialConfigId, maxCards: initialMaxCards, taskId: initialTaskId }) {
+function TestWords({ onNavigate, wordCount: initialWordCount, configId: initialConfigId, maxCards: initialMaxCards, taskId: initialTaskId, isActive }) {
   const { authFetch } = useAuth()
   const wordCount = initialWordCount || DEFAULT_TEST_WORD_COUNT
   const configId = initialConfigId || null
@@ -610,6 +611,7 @@ function TestWords({ onNavigate, wordCount: initialWordCount, configId: initialC
 
 
   return (
+    <>
     <div className="test-container test-container-fullscreen">
       <button className="close-x-button" onClick={handleClose}>
         ✕
@@ -636,11 +638,6 @@ function TestWords({ onNavigate, wordCount: initialWordCount, configId: initialC
               )
             })}
           </div>
-          <div className="preview-actions">
-            <button className="test-start-button" onClick={handleStartTest}>
-              Начать
-            </button>
-          </div>
         </div>
       ) : showResults ? (
         <div className="test-results">
@@ -664,15 +661,6 @@ function TestWords({ onNavigate, wordCount: initialWordCount, configId: initialC
               )
             })}
           </div>
-          <div className="results-actions">
-            <button
-              className="test-finish-button"
-              onClick={handleFinish}
-              disabled={isClosing}
-            >
-              {isClosing ? 'Завершение…' : 'Закончить'}
-            </button>
-          </div>
         </div>
       ) : (
         <div className="test-screen">
@@ -804,6 +792,43 @@ function TestWords({ onNavigate, wordCount: initialWordCount, configId: initialC
         </div>
       )}
     </div>
+    {isActive && (showPreview || showResults) ? createPortal(
+      <div style={{
+        position: 'fixed',
+        bottom: 0,
+        left: 0,
+        right: 0,
+        padding: '0.75rem 1rem',
+        paddingBottom: 'max(0.75rem, env(safe-area-inset-bottom))',
+        background: 'linear-gradient(to top, white 60%, rgba(255,255,255,0))',
+        zIndex: 1500,
+        display: 'flex',
+        justifyContent: 'center',
+      }}>
+        <button
+          onClick={showPreview ? handleStartTest : handleFinish}
+          disabled={showResults && isClosing}
+          style={{
+            width: '100%',
+            maxWidth: '42rem',
+            padding: '0.875rem',
+            background: 'linear-gradient(to right, #10b981, #059669)',
+            color: 'white',
+            border: 'none',
+            borderRadius: '0.5rem',
+            fontSize: '1rem',
+            fontWeight: 600,
+            cursor: (showResults && isClosing) ? 'not-allowed' : 'pointer',
+            opacity: (showResults && isClosing) ? 0.6 : 1,
+            transition: 'all 0.2s',
+          }}
+        >
+          {showPreview ? 'Начать' : (isClosing ? 'Завершение…' : 'Завершить')}
+        </button>
+      </div>,
+      document.body
+    ) : null}
+    </>
   )
 }