From 8c371c50662e8b3c046ce7d92119ab0bd682762b Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Tue, 2 Aug 2022 15:47:27 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=E3=82=B5=E3=83=96=E3=83=93=E3=83=A5?=
 =?UTF-8?q?=E3=83=BC=E8=A1=A8=E7=A4=BA=E6=99=82=E3=81=AB=E3=80=8C=E9=96=89?=
 =?UTF-8?q?=E3=81=98=E3=82=8B=E3=80=8D=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AE?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AgileWorks/WebView/View/WebViewController.swift | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
index 676bc2f..6d37173 100644
--- a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
+++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
@@ -334,6 +334,7 @@ class WebViewController: UIViewController {
 
     @IBAction private func closeTapped() {
         self.dismiss(animated: true, completion: nil)
+        subViewStack.pop()
     }
 
     // 接続確認ボタンタップ処理
@@ -418,6 +419,11 @@ extension WebViewController: WKUIDelegate {
             subWebView.navigationDelegate = self
             subViewStack.push(subWebView, superView: mainWebView)
             subWebView.load(navigationAction.request)
+            
+            //キャンセルボタンの表示
+            self.closeButton.title = getDisplayString(key: "Close", comment: "")
+            self.closeButton.isEnabled = true
+            
             return subWebView
         }
         return nil
@@ -543,9 +549,6 @@ extension WebViewController: WKNavigationDelegate {
                     return
                 }
                 DispatchQueue.main.async {[self] in
-                    subViewStack.pop()
-                    subWebView = WKWebView(frame: self.formView.bounds, configuration: WKWebViewConfiguration())
-                    subViewStack.push(subWebView, superView: mainWebView)
                     self.subWebView.loadFileURL(tempPath, allowingReadAccessTo: tempPath)
                 }
             }.resume()
@@ -566,7 +569,9 @@ extension WebViewController: WKNavigationDelegate {
 extension WebViewController: SubViewStackEventDelegate {
     func onClose(webView: WKWebView, stack: SubViewStack) {
         if stack.isEmpty {
-            //closeButton.title = localizadStrings(key: "Close", comment: "")
+            //キャンセルボタン非表示
+            self.closeButton.title = ""
+            self.closeButton.isEnabled = false
         }
     }
 }
-- 
GitLab


From f9b59c34ff2757ae5fd34925340d915fa3a26cad Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Tue, 9 Aug 2022 10:31:44 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=E9=96=A2=E9=80=A3=E6=9B=B8=E9=A1=9E?=
 =?UTF-8?q?=E3=81=BE=E3=81=9F=E3=81=AF=E9=80=9A=E7=9F=A5=E3=81=8B=E3=82=89?=
 =?UTF-8?q?=E3=81=AE=E6=9B=B8=E9=A1=9E=E3=82=92=E9=96=89=E3=81=98=E3=82=8B?=
 =?UTF-8?q?=E6=8C=99=E5=8B=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AgileWorks/AgileWorks/WebView/View/WebViewController.swift | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
index 6d37173..5706fe5 100644
--- a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
+++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
@@ -333,8 +333,11 @@ class WebViewController: UIViewController {
     }
 
     @IBAction private func closeTapped() {
-        self.dismiss(animated: true, completion: nil)
-        subViewStack.pop()
+        if subViewStack.pop() == nil {
+            if self.showNotification {
+                self.dismiss(animated: true, completion: nil)
+            }
+        }
     }
 
     // 接続確認ボタンタップ処理
-- 
GitLab


From f313756cef4fdf5aadb878d5bd9000308ecb2527 Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Tue, 9 Aug 2022 15:56:41 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=9B=B8=E9=A1=9E?=
 =?UTF-8?q?=E3=81=AE=E9=96=A2=E9=80=A3=E6=9B=B8=E9=A1=9E=E3=83=9C=E3=82=BF?=
 =?UTF-8?q?=E3=83=B3=E9=9D=9E=E8=A1=A8=E7=A4=BA=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AgileWorks/WebView/View/WebViewController.swift       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
index 5706fe5..6a2d4f4 100644
--- a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
+++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
@@ -572,9 +572,11 @@ extension WebViewController: WKNavigationDelegate {
 extension WebViewController: SubViewStackEventDelegate {
     func onClose(webView: WKWebView, stack: SubViewStack) {
         if stack.isEmpty {
-            //キャンセルボタン非表示
-            self.closeButton.title = ""
-            self.closeButton.isEnabled = false
+            if !self.showNotification {
+                //キャンセルボタン非表示
+                self.closeButton.title = ""
+                self.closeButton.isEnabled = false
+            }
         }
     }
 }
-- 
GitLab