diff --git a/MVMCoreUI/Atomic/Atoms/Views/WebView.swift b/MVMCoreUI/Atomic/Atoms/Views/WebView.swift index 3d870f53..59306739 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/WebView.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/WebView.swift @@ -14,7 +14,6 @@ import WebKit let mvmWebViewMessageHandler = "mvmWebViewMessageHandler" public let loadingSpinner = MFLoadingSpinner(frame: .zero) - var delegateObject: MVMCoreUIDelegateObject? var webView: WKWebView? var webViewHeight: NSLayoutConstraint? @@ -27,26 +26,24 @@ import WebKit override open func setupView() { super.setupView() - let webView = createWebView(messageHandler: mvmWebViewMessageHandler) - addSubview(webView) - NSLayoutConstraint.constraintPinSubview(toSuperview: webView) - self.webView = webView + createWebView(messageHandler: mvmWebViewMessageHandler) pinSpinnerView() } - func createWebView(messageHandler: String?) -> WKWebView { + func createWebView(messageHandler: String?) { let wkUserController = WKUserContentController() if let messageHandlerName = messageHandler { wkUserController.add(self, name: messageHandlerName) } - let wkConfig = WKWebViewConfiguration() wkConfig.userContentController = wkUserController let webView = WKWebView(frame: .zero, configuration: wkConfig) webView.translatesAutoresizingMaskIntoConstraints = false webView.uiDelegate = self webView.navigationDelegate = self - return webView + self.webView = webView + addSubview(webView) + NSLayoutConstraint.constraintPinSubview(toSuperview: webView) }