From 8749f21ac8b9056a47cfa9e6a9ece1a2532205c3 Mon Sep 17 00:00:00 2001
From: poignatov <poignatov@avito.ru>
Date: Sun, 15 Mar 2026 18:48:34 +0300
Subject: [PATCH] =?UTF-8?q?6.18.2:=20=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=B3=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BD=D0=B0?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B4=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B7=D0=B0=D0=B4?=
 =?UTF-8?q?=D0=B0=D1=87=D0=B8?=
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  | 14 +++++++++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 2016ec3..ab1d615 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.18.1
+6.18.2
diff --git a/play-life-web/package.json b/play-life-web/package.json
index d1eaee6..57ec795 100644
--- a/play-life-web/package.json
+++ b/play-life-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "play-life-web",
-  "version": "6.18.1",
+  "version": "6.18.2",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/play-life-web/src/App.jsx b/play-life-web/src/App.jsx
index 2bbf2fa..c16f74c 100644
--- a/play-life-web/src/App.jsx
+++ b/play-life-web/src/App.jsx
@@ -948,7 +948,19 @@ function AppContent() {
           if (isNewTabMain) {
             clearUrl()
           } else if (isNewTabDeep) {
-            updateUrl(tab, {}, activeTab)
+            // Если текущая запись — модальное окно, заменяем её вместо push
+            const currentState = window.history.state || {}
+            const isFromModal = currentState.modalOpen === true || currentState.conditionForm === true
+            if (isFromModal) {
+              const url = new URL(window.location)
+              url.searchParams.set('tab', tab)
+              const keysToRemove = []
+              url.searchParams.forEach((value, key) => { if (key !== 'tab') keysToRemove.push(key) })
+              keysToRemove.forEach(key => url.searchParams.delete(key))
+              window.history.replaceState({ tab, params: {}, previousTab: activeTab }, '', url)
+            } else {
+              updateUrl(tab, {}, activeTab)
+            }
           }
         } else {
           setTabParams(params)