From 6f7dd764dd0af8758a7efbfcc2f8394d8bed267d Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Fri, 18 Mar 2022 16:48:14 -0700 Subject: [PATCH] use webviewmanager to resue webviews --- .../Sources/App/Views/WebReader/WebReader.swift | 7 +++++-- .../App/Views/WebReader/WebReaderContent.swift | 1 - .../Sources/Views/Article/WebAppView.swift | 2 +- .../Sources/Views/Article/WebView.swift | 14 +++++++------- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift index cf288d259..03280d3b6 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift @@ -4,6 +4,7 @@ import Services import SwiftUI import UIKit import Utils +import Views import WebKit final class WebReaderViewModel: ObservableObject { @@ -48,6 +49,9 @@ struct WebReaderContainerView: View { } } } + }.onDisappear { + // Clear the shared webview content when exiting + WebViewManager.shared().loadHTMLString("", baseURL: nil) } } } @@ -57,8 +61,7 @@ struct WebReader: UIViewRepresentable { let item: FeedItem func makeUIView(context _: Context) -> WKWebView { - print(WebReaderResources.bundleURL) - let webView = WKWebView() + let webView = WebViewManager.create() webView.loadHTMLString( WebReaderContent(htmlContent: htmlContent, item: item).styledContent, baseURL: WebReaderResources.bundleURL diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift index d36ba5ff3..90478d832 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift @@ -44,7 +44,6 @@ struct WebReaderContent {
-
React App\(WebReaderResources.bundleURL)