From 45f9aa99e6a205ecdc9e7d27535a4493280ef8ea Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Thu, 18 Aug 2022 14:22:52 +0900
Subject: [PATCH] =?UTF-8?q?viewDidLoad()=E3=81=A7webview=E3=82=92=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WebView/View/WebViewController.swift         | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
index 6a2d4f4..aedf09a 100644
--- a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
+++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
@@ -47,6 +47,9 @@ class WebViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        
+        //webviewの生成
+        self.setWebView()
 
         // naviBarButton 設定
         if self.showNotification {
@@ -172,7 +175,6 @@ class WebViewController: UIViewController {
 
     // WidgetからWebView ロード処理
     func widgetLoadWebView(url: String) {
-        setWebView()
         loadWebView(url: url)
     }
 
@@ -212,7 +214,6 @@ class WebViewController: UIViewController {
                 if isInit {
                     // 画面ロード
                     DispatchQueue.main.async {
-                        self.setWebView()
                         self.loadWebView(url: self.loadURL)
                         self.initLoadComp = true
                     }
@@ -302,6 +303,11 @@ class WebViewController: UIViewController {
             if let url = change![NSKeyValueChangeKey.newKey] as? URL {
                 let urlString: String = url.absoluteString
                 self.nowURL = urlString
+                
+                if urlString != loadURL {
+                    mainWebView.allowsBackForwardNavigationGestures = true
+                }
+                
                 DispatchQueue.main.async {
                     // token チェック
                     self.updateSession(isInit: false)
@@ -381,7 +387,11 @@ class WebViewController: UIViewController {
             }
         }
         if viewReload {
-            setWebView()
+            //履歴をリセットする
+            mainWebView.allowsBackForwardNavigationGestures = false
+            if mainWebView.canGoBack {
+                mainWebView.go(to: mainWebView.backForwardList.backList.first!)
+            }
             loadWebView(url: self.loadURL)
         }
     }
-- 
GitLab