From 56063d23f3c5154e7cff8302dcbf120306239003 Mon Sep 17 00:00:00 2001
From: Martin Heppner <105971399+martinheppner@users.noreply.github.com>
Date: Sun, 15 Sep 2024 18:25:25 +0200
Subject: [PATCH] Check if window.closed

---
 package-lock.json                | 10 ++++++++++
 src/views/Main/DetailReworked.js |  6 ++----
 yarn.lock                        |  9 ++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6ddac7a..ee00b3e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -54,6 +54,7 @@
         "@testing-library/user-event": "^14.5.2",
         "@types/react-helmet": "^6.1.11",
         "babel-loader": "^9.1.2",
+        "babel-plugin-import": "^1.13.8",
         "clean-webpack-plugin": "^4.0.0",
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^6.7.3",
@@ -7416,6 +7417,15 @@
         "webpack": ">=5"
       }
     },
+    "node_modules/babel-plugin-import": {
+      "version": "1.13.8",
+      "resolved": "https://registry.npmjs.org/babel-plugin-import/-/babel-plugin-import-1.13.8.tgz",
+      "integrity": "sha512-36babpjra5m3gca44V6tSTomeBlPA7cHUynrE2WiQIm3rEGD9xy28MKsx5IdO45EbnpJY7Jrgd00C6Dwt/l/2Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.0.0"
+      }
+    },
     "node_modules/babel-plugin-istanbul": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
diff --git a/src/views/Main/DetailReworked.js b/src/views/Main/DetailReworked.js
index e92be6a..7374c6c 100644
--- a/src/views/Main/DetailReworked.js
+++ b/src/views/Main/DetailReworked.js
@@ -114,10 +114,8 @@ const DetailReworked = (props) => {
   };
 
   const handleCloseTab = () => {
-    if (!!_city && _city !== "no-city" && !!idOne) {
-      window.close();
-    }
-    else {
+    window.close();
+    if (!window.closed) {
       goToSearchPage();
     }
   };
diff --git a/yarn.lock b/yarn.lock
index b8f2e8d..8c90cdc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -160,7 +160,7 @@
     "@babel/traverse" "^7.24.8"
     "@babel/types" "^7.24.8"
 
-"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.24.7":
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.24.7":
   version "7.24.7"
   resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz"
   integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==
@@ -3427,6 +3427,13 @@ babel-loader@^9.1.2:
     find-cache-dir "^4.0.0"
     schema-utils "^4.0.0"
 
+babel-plugin-import@^1.13.8:
+  version "1.13.8"
+  resolved "https://registry.npmjs.org/babel-plugin-import/-/babel-plugin-import-1.13.8.tgz"
+  integrity sha512-36babpjra5m3gca44V6tSTomeBlPA7cHUynrE2WiQIm3rEGD9xy28MKsx5IdO45EbnpJY7Jrgd00C6Dwt/l/2Q==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+
 babel-plugin-istanbul@^6.1.1:
   version "6.1.1"
   resolved "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz"